From e1dd4d6e3f9b3153b8c637f8210f724fb0288118 Mon Sep 17 00:00:00 2001
From: ovclas <ovclas@gmail.com>
Date: Mon, 19 Sep 2011 01:32:00 +0000
Subject: [PATCH] issue 160 when admin menu add, menu group create. document
 count without temp status in dashbard

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9188 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/admin/admin.admin.view.php                  | 5 +++--
 modules/admin/tpl/js/menu_setup.js                  | 7 +++++--
 modules/document/document.admin.model.php           | 3 ++-
 modules/document/queries/getDocumentCountByDate.xml | 1 +
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/modules/admin/admin.admin.view.php b/modules/admin/admin.admin.view.php
index 45bf46506..33aaed536 100644
--- a/modules/admin/admin.admin.view.php
+++ b/modules/admin/admin.admin.view.php
@@ -230,8 +230,9 @@
 
             // Document Status
 			$oDocumentAdminModel = &getAdminModel('document');
-			$status->document->todayCount = $oDocumentAdminModel->getDocumentCountByDate($today);
-			$status->document->totalCount = $oDocumentAdminModel->getDocumentCountByDate();
+			$statusList = array('PUBLIC', 'SECRET');
+			$status->document->todayCount = $oDocumentAdminModel->getDocumentCountByDate($today, array(), $statusList);
+			$status->document->totalCount = $oDocumentAdminModel->getDocumentCountByDate('', array(), $statusList);
 
             // Comment Status
 			$oCommentModel = &getModel('comment');
diff --git a/modules/admin/tpl/js/menu_setup.js b/modules/admin/tpl/js/menu_setup.js
index 5b343e6c2..8a4166a11 100644
--- a/modules/admin/tpl/js/menu_setup.js
+++ b/modules/admin/tpl/js/menu_setup.js
@@ -17,17 +17,20 @@ jQuery(function($){
 
 	function completeGetActList(obj)
 	{
+		var $optgroup;
+
 		moduleList = obj.menuList;
+		console.log(moduleList);
 		if(moduleList)
 		{
  			var menuNameList = $('#menuNameList');
 			for(var x in moduleList)
 			{
 				var menuList = moduleList[x];
+				$optgroup = $('<optgroup label="'+x+'" />').appendTo(menuNameList);
 				for(var y in menuList)
 				{
-					var menu = menuList[y];
-					menuNameList.append('<option value="'+x+':'+y+'">'+menu.title+'</option>');
+					$optgroup.append('<option value="'+x+':'+y+'">'+menuList[y].title+'</option>');
 				}
 			}
 		}
diff --git a/modules/document/document.admin.model.php b/modules/document/document.admin.model.php
index 5ab6cc422..819f9cb00 100644
--- a/modules/document/document.admin.model.php
+++ b/modules/document/document.admin.model.php
@@ -80,9 +80,10 @@
         /**
          * @brief Return document count with date
          **/
-        function getDocumentCountByDate($date = '', $moduleSrlList = array()) {
+        function getDocumentCountByDate($date = '', $moduleSrlList = array(), $statusList = array()) {
 			if($date) $args->regDate = date('Ymd', strtotime($date));
 			if(count($moduleSrlList)>0) $args->moduleSrlList = $moduleSrlList;
+			if(count($statusList)>0) $args->statusList = $statusList;
 
 			$output = executeQuery('document.getDocumentCountByDate', $args);
 			if(!$output->toBool()) return 0;
diff --git a/modules/document/queries/getDocumentCountByDate.xml b/modules/document/queries/getDocumentCountByDate.xml
index 423fb8e52..cd95b57ab 100644
--- a/modules/document/queries/getDocumentCountByDate.xml
+++ b/modules/document/queries/getDocumentCountByDate.xml
@@ -8,5 +8,6 @@
     <conditions>
 		<condition operation="in" column="module_srl" var="moduleSrlList" />
 		<condition operation="like_prefix" column="regdate" var="regDate" pipe="and" />
+		<condition operation="in" column="status" var="statusList" pipe="and" />
     </conditions>
 </query>