issue 70 list count modified in content admin

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@8854 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2011-08-24 05:35:15 +00:00
parent b87aedbd2b
commit ac9bf88af4
13 changed files with 355 additions and 183 deletions

View file

@ -43,19 +43,6 @@
$oDocumentModel = &getModel('document');
$output = $oDocumentModel->getDocumentList($args);
// count eache status, not in trash...
$countOutput = $oDocumentModel->getDocumentCountByGroupStatus($args);;
if(is_array($countOutput))
{
$statusCount = array();
foreach($countOutput AS $key=>$value)
$statusCount[$value->status] = $value->count;
if(!array_key_exists('PUBLIC', $statusCount)) $statusCount['PUBLIC'] = 0;
if(!array_key_exists('SECRET', $statusCount)) $statusCount['SECRET'] = 0;
if(!array_key_exists('TEMP', $statusCount)) $statusCount['TEMP'] = 0;
}
// get Status name list
$statusNameList = $oDocumentModel->getStatusNameList();
@ -66,7 +53,6 @@
Context::set('document_list', $output->data);
Context::set('status_name_list', $statusNameList);
Context::set('page_navigation', $output->page_navigation);
Context::set('statusCount', $statusCount);
// set a search option used in the template
$count_search_option = count($this->search_option);

View file

@ -7,14 +7,24 @@
<h1 class="h1">{$lang->document}</h1>
<div class="table even">
<div class="cnb">
<a href="{getUrl('', 'module', 'admin', 'act', 'dispDocumentAdminList')}" class="active">All</a>
| <a href="{getUrl('search_target', 'is_secret', 'search_keyword', 'N')}">{$status_name_list['PUBLIC']}({$statusCount['PUBLIC']})</a>
| <a href="{getUrl('search_target', 'is_secret', 'search_keyword', 'Y')}">{$status_name_list['SECRET']}({$statusCount['SECRET']})</a>
| <a href="{getUrl('search_target', 'is_secret', 'search_keyword', 'temp')}">{$status_name_list['TEMP']}({$statusCount['TEMP']})</a>
<a href="{getUrl('', 'module', 'admin', 'act', 'dispDocumentAdminList')}" <!--@if($search_keyword == '')-->class="active"<!--@end-->>All</a>
| <a href="{getUrl('search_target', 'is_secret', 'search_keyword', 'N')}" <!--@if($search_target == 'is_secret' && $search_keyword == 'N')-->class="active"<!--@end-->>{$status_name_list['PUBLIC']}</a>
| <a href="{getUrl('search_target', 'is_secret', 'search_keyword', 'Y')}" <!--@if($search_target == 'is_secret' && $search_keyword == 'Y')-->class="active"<!--@end-->>{$status_name_list['SECRET']}</a>
| <a href="{getUrl('search_target', 'is_secret', 'search_keyword', 'temp')}" <!--@if($search_target == 'is_secret' && $search_keyword == 'temp')-->class="active"<!--@end-->>{$status_name_list['TEMP']}</a>
| <a href="{getUrl('', 'module', 'admin', 'act', 'dispTrashAdminList')}">{$lang->cmd_trash}</a>
</div>
<table width="100%" border="1" cellspacing="0" id="documentListTable">
<caption>
All({number_format($total_count)})
<!--@if($search_keyword == '')-->
All
<!--@elseif($search_target == 'is_secret' && $search_keyword == 'N')-->
{$status_name_list['PUBLIC']}
<!--@elseif($search_target == 'is_secret' && $search_keyword == 'Y')-->
{$status_name_list['SECRET']}
<!--@elseif($search_target == 'is_secret' && $search_keyword == 'temp')-->
{$status_name_list['TEMP']}
<!--@end-->
({number_format($total_count)})
<div class="side">
<span class="btn"><a href="#listManager" class="modalAnchor" onclick="getDocumentList();">{$lang->document_manager}...</a></span>
</div>