From 2caf12ec6131cf81395ae4df055bcaf8cb05f837 Mon Sep 17 00:00:00 2001
From: Riccardo Di Dato <r.didato@asdynamics.it>
Date: Thu, 14 Jan 2016 12:44:29 +0100
Subject: [PATCH] dao find sostituisce id con _id

---
 private/lib/dao/GenericDao.php    | 14 +++++++++++---
 private/lib/gui/MenuGenerator.php |  2 +-
 public/admin/roleAdmin.php        |  5 ++++-
 public/style/admin.css            |  9 ++++++---
 4 files changed, 22 insertions(+), 8 deletions(-)

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
+?>
+<div>
+altro
+</div>
\ No newline at end of file
diff --git a/public/style/admin.css b/public/style/admin.css
index 2a50f03..db10755 100644
--- a/public/style/admin.css
+++ b/public/style/admin.css
@@ -1,6 +1,9 @@
 @CHARSET "UTF-8";
 
-#admin_menu{position:absolute; left:0; top:0; bottom:0; width:300px; background-color:#000000; display:inline-block;}
+#admin_menu{position:absolute; left:0; top:0; bottom:0; width:300px; background-color:#393939; display:inline-block;}
 
-#admin_menu ul{list-style: none; width:100;}
-#admin_menu ul li{width:100; height:50px;}
\ No newline at end of file
+#admin_menu ul{list-style: none; width:100%; border:0; margin:0; padding:0;}
+#admin_menu ul li{width:100%; height:50px; display:inline-block;}
+#admin_menu ul li a{width:100%; line-height:50px; display:inline-block; text-decoration:none; color:white; font-weight:bold;}
+#admin_menu ul li a:hover{background-color:#505050;}
+#admin_menu + div{margin-left:300px; }
\ No newline at end of file