diff --git a/private/lib/dao/GenericDao.php b/private/lib/dao/GenericDao.php index 6c8a54a..c2bb5b9 100644 --- a/private/lib/dao/GenericDao.php +++ b/private/lib/dao/GenericDao.php @@ -47,10 +47,18 @@ class GenericDao{ $collectionName = $modelClass::getCollectionName(); $collection = $this->database->$collectionName; - if (!array_key_exists("deleted",$filter)){ - $filter["deleted"] = false; + $useFilter = $filter; + + if (!array_key_exists("deleted",$useFilter)){ + $useFilter["deleted"] = false; } - $cursor = $collection->find($filter); + + if (array_key_exists("id",$useFilter)){ + $useFilter["_id"] = $useFilter["id"]; + unset($useFilter["id"]); + } + + $cursor = $collection->find($useFilter); if (array_key_exists("sort",$options)){ $cursor->sort($options["sort"]); diff --git a/private/lib/gui/MenuGenerator.php b/private/lib/gui/MenuGenerator.php index 2a65283..18f6df7 100644 --- a/private/lib/gui/MenuGenerator.php +++ b/private/lib/gui/MenuGenerator.php @@ -8,7 +8,7 @@ class MenuGenerator { private static $voices = array( array("label"=>"superAdmin","page"=>"superAdmin.php","requires"=>AdminModel::ADMIN_TYPE_SUPERADMIN), - array("label"=>"roleAdmin","page"=>"roleAdmin.php","requires"=>AdminModel::ADMIN_TYPE_NORMALADMIN), + array("label"=>"Amministra Utenti","page"=>"roleAdmin.php","requires"=>AdminModel::ADMIN_TYPE_NORMALADMIN), array("label"=>"users","page"=>"users.php","requires"=>AdminModel::ADMIN_TYPE_NORMALADMIN), array("label"=>"notizie","page"=>"notizie.php","requires"=>AdminModel::ADMIN_TYPE_EDITORE_SUPERVISOR), array("label"=>"myNotizie","page"=>"myNotizie.php","requires"=>AdminModel::ADMIN_TYPE_EDITORE), diff --git a/public/admin/roleAdmin.php b/public/admin/roleAdmin.php index dc2bafd..3442af5 100644 --- a/public/admin/roleAdmin.php +++ b/public/admin/roleAdmin.php @@ -14,4 +14,7 @@ if (!AdminLoginManager::isLogged()){ MenuGenerator::generateMenu(); -?> \ No newline at end of file +?> +