diff --git a/modules/comment/comment.admin.view.php b/modules/comment/comment.admin.view.php index 44492225d..c756cf48a 100644 --- a/modules/comment/comment.admin.view.php +++ b/modules/comment/comment.admin.view.php @@ -33,7 +33,13 @@ $output = $oCommentModel->getTotalCommentList($args, $columnList); // get total comment count group by is_secret status + $tmp->search_target = Context::get('search_target'); + $tmp->search_keyword = Context::get('search_keyword'); + Context::set('search_target', ''); + Context::set('search_keyword', ''); $countOutput = $oCommentModel->getTotalCommentCount($args); + Context::set('search_target', $tmp->search_target); + Context::set('search_keyword', $tmp->search_keyword); // set values in the return object of comment_model:: getTotalCommentList() in order to use a template. Context::set('total_count', $output->total_count); diff --git a/modules/comment/tpl/comment_list.html b/modules/comment/tpl/comment_list.html index 520d10b3c..d28001823 100644 --- a/modules/comment/tpl/comment_list.html +++ b/modules/comment/tpl/comment_list.html @@ -11,8 +11,6 @@ | {$secret_name_list[$value->is_secret]}({$value->count}) - | {$lang->accusation}(#) - | {$lang->trash}(#)
{$lang->comment_manager}...
diff --git a/modules/document/tpl/document_list.html b/modules/document/tpl/document_list.html index 623ac48fc..a98bb4f35 100644 --- a/modules/document/tpl/document_list.html +++ b/modules/document/tpl/document_list.html @@ -12,8 +12,6 @@ | {$status_name_list['PUBLIC']}({$statusCount['PUBLIC']}) | {$status_name_list['SECRET']}({$statusCount['SECRET']}) | {$status_name_list['TEMP']}({$statusCount['TEMP']}) - | {$lang->accusation}(#) - | {$lang->trash}(#)
{$lang->document_manager}...
diff --git a/modules/file/file.admin.model.php b/modules/file/file.admin.model.php index 0619723b1..ac6c4998c 100644 --- a/modules/file/file.admin.model.php +++ b/modules/file/file.admin.model.php @@ -53,8 +53,8 @@ /** * @brief Return number of attachments which belongs to a specific document **/ - function getFilesCountByGroupValid($obj) { - $this->_makeSearchParam($obj, $args); + function getFilesCountByGroupValid($obj = '') { + //$this->_makeSearchParam($obj, $args); $output = executeQueryArray('file.getFilesCountByGroupValid', $args); return $output->data; diff --git a/modules/file/file.admin.view.php b/modules/file/file.admin.view.php index dbb2978d7..0dc4cdd6f 100644 --- a/modules/file/file.admin.view.php +++ b/modules/file/file.admin.view.php @@ -155,7 +155,7 @@ } } - $countOutput = $oFileAdminModel->getFilesCountByGroupValid($args); + $countOutput = $oFileAdminModel->getFilesCountByGroupValid(); $validCount = array(); if(is_array($countOutput)) { diff --git a/modules/file/tpl/file_list.html b/modules/file/tpl/file_list.html index 8365b237d..f4fb33cc2 100644 --- a/modules/file/tpl/file_list.html +++ b/modules/file/tpl/file_list.html @@ -10,7 +10,6 @@ All({number_format($total_count)}) | {$lang->is_valid}({number_format((int)$valid_count['Y'])}) | {$lang->is_stand_by}({number_format((int)$valid_count['N'])}) - | {$lang->trash}(#) {$lang->file_manager}... @@ -87,7 +86,7 @@ {$val->ipaddress} {$lang->is_valid}{$lang->is_stand_by} - isCarted)-->checked="checked" /> + isCarted)-->checked="checked" />