fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-14 00:39:57 +09:00
Code Issues Projects Releases Packages Wiki Activity

issue 160 when admin menu add, menu group create.

Browse source 
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
This commit is contained in:
ovclas 2011-09-19 01:32:00 +00:00
parent eacdaed16f
commit e1dd4d6e3f
4 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
modules/admin/admin.admin.view.php
View file

@ -230,8 +230,9 @@
// Document Status // Document Status
$oDocumentAdminModel = &getAdminModel('document'); $oDocumentAdminModel = &getAdminModel('document');
$status->document->todayCount = $oDocumentAdminModel->getDocumentCountByDate($today); $statusList = array('PUBLIC', 'SECRET');
$status->document->totalCount = $oDocumentAdminModel->getDocumentCountByDate(); $status->document->todayCount = $oDocumentAdminModel->getDocumentCountByDate($today, array(), $statusList);
$status->document->totalCount = $oDocumentAdminModel->getDocumentCountByDate('', array(), $statusList);
// Comment Status // Comment Status
$oCommentModel = &getModel('comment'); $oCommentModel = &getModel('comment');

7
modules/admin/tpl/js/menu_setup.js
View file

@ -17,17 +17,20 @@ jQuery(function($){
function completeGetActList(obj) function completeGetActList(obj)
{ {
var $optgroup;
moduleList = obj.menuList; moduleList = obj.menuList;
console.log(moduleList);
if(moduleList) if(moduleList)
{ {
var menuNameList = $('#menuNameList'); var menuNameList = $('#menuNameList');
for(var x in moduleList) for(var x in moduleList)
{ {
var menuList = moduleList[x]; var menuList = moduleList[x];
$optgroup = $('<optgroup label="'+x+'" />').appendTo(menuNameList);
for(var y in menuList) for(var y in menuList)
{ {
var menu = menuList[y]; $optgroup.append('<option value="'+x+':'+y+'">'+menuList[y].title+'</option>');
menuNameList.append('<option value="'+x+':'+y+'">'+menu.title+'</option>');
} }
} }
} }

3
modules/document/document.admin.model.php
View file

@ -80,9 +80,10 @@
/** /**
* @brief Return document count with date * @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($date) $args->regDate = date('Ymd', strtotime($date));
if(count($moduleSrlList)>0) $args->moduleSrlList = $moduleSrlList; if(count($moduleSrlList)>0) $args->moduleSrlList = $moduleSrlList;
if(count($statusList)>0) $args->statusList = $statusList;
$output = executeQuery('document.getDocumentCountByDate', $args); $output = executeQuery('document.getDocumentCountByDate', $args);
if(!$output->toBool()) return 0; if(!$output->toBool()) return 0;

1
modules/document/queries/getDocumentCountByDate.xml
View file

@ -8,5 +8,6 @@
<conditions> <conditions>
<condition operation="in" column="module_srl" var="moduleSrlList" /> <condition operation="in" column="module_srl" var="moduleSrlList" />
<condition operation="like_prefix" column="regdate" var="regDate" pipe="and" /> <condition operation="like_prefix" column="regdate" var="regDate" pipe="and" />
<condition operation="in" column="status" var="statusList" pipe="and" />
</conditions> </conditions>
</query> </query>