diff --git a/oth/docs/install.memo b/oth/docs/install.memo index 2f0ba01..77f99b8 100644 --- a/oth/docs/install.memo +++ b/oth/docs/install.memo @@ -8,3 +8,6 @@ db.runCommand({ textSearchEnabled: 1 }); + +INDEX DA CREARE +db.notizia.ensureIndex({"about.author":"text",titolo:"text",sottotitolo:"text",testo:"text"}) diff --git a/private/lib/dao/GenericDao.php b/private/lib/dao/GenericDao.php index 76ccaa6..ee27b82 100644 --- a/private/lib/dao/GenericDao.php +++ b/private/lib/dao/GenericDao.php @@ -250,7 +250,12 @@ class GenericDao{ /** * Ritorna la lista dei notizia model ordinati per pertinenza - * @param string $searchStr + * @param string $modelClass + * @param string $searchWord + * @param array $filter + * @param array $options + * @throws CoreException + * @return DaoSaveable[] */ public function search($modelClass, $searchWord, array $filter = array(), array $options = array()){ if (!is_null($modelClass)){ diff --git a/private/lib/gui/DatatablesHelper.php b/private/lib/gui/DatatablesHelper.php index 545b026..004648a 100644 --- a/private/lib/gui/DatatablesHelper.php +++ b/private/lib/gui/DatatablesHelper.php @@ -27,8 +27,16 @@ class DatatablesHelper { $options["sort"][$key] = strcasecmp($details["dir"], "asc")==0?1:-1; } } + + $models = array(); + if (array_key_exists("search", $_POST) && array_key_exists("value", $_POST["search"]) && strcmp(trim($_POST["search"]["value"]),"")!=0 ){ + $models = $dao->query($useModel, trim($_POST["search"]["value"]),$filter, $options); + } + else { + $models = $dao->query($useModel, $filter, $options); + } - $models = $dao->query($useModel, $filter, $options); + if (sizeof($models)>0){ foreach ($models as $model){ diff --git a/public/searchResults.php b/public/searchResults.php index 5fd7b6f..4099b04 100644 --- a/public/searchResults.php +++ b/public/searchResults.php @@ -13,7 +13,7 @@ try { if(array_key_exists("search", $_POST) && strcmp($_POST["search"], "")!=0){ $searchParameters = strip_tags(PostHandler::get("search")); - $notizie = GlobalVariables::get("dao")->query("NotiziaModel", + $notizie = GlobalVariables::get("dao")->search("NotiziaModel",$searchParameters, array("status"=>NotiziaModel::STATUS_ACCEPTED), array("sort"=>array("about.data"=>-1),"limit"=>10) ); diff --git a/public/style/admin.css b/public/style/admin.css index 6210b41..48ec083 100644 --- a/public/style/admin.css +++ b/public/style/admin.css @@ -68,7 +68,7 @@ form > div{margin:5px 0;} .notiziaMenu ul {list-style:none; display:inline-block; padding:0 20px;} .notiziaMenu ul li{margin: 10px 0px;display: block; clear:both;} -div.notiziaAcceptance{text-align: center; background-color: #ffd677; padding: 20px; border: 1px solid grey; border-radius: 10px;} +div.notiziaAcceptance{text-align: center; background-color: #ffd677; padding: 20px; border: 1px solid grey; border-radius: 10px;margin-bottom:10px;} div.notiziaAcceptance > .buttons a{text-decoration:none; color:rgb(51, 102, 255); font-weight:bold; margin-right:5px; padding:5px; display:inline-block;} div.notiziaAcceptance > .buttons a.green:hover{background-color:#7EFF83;} div.notiziaAcceptance > .buttons a.red:hover{background-color:#FF8DA6;}