diff --git a/modules/document/document.admin.view.php b/modules/document/document.admin.view.php index 725350e23..4e943b577 100644 --- a/modules/document/document.admin.view.php +++ b/modules/document/document.admin.view.php @@ -56,14 +56,14 @@ class DocumentAdminView extends Document $args->sort_index = 'list_order'; // /< sorting value $args->module_srl = Context::get('module_srl'); $args->statusList = []; + $args->use_division = false; // get a list - $oDocumentModel = getModel('document'); $columnList = array('document_srl', 'module_srl', 'category_srl', 'member_srl', 'title', 'nick_name', 'comment_count', 'trackback_count', 'readed_count', 'voted_count', 'blamed_count', 'regdate', 'ipaddress', 'status'); - $output = $oDocumentModel->getDocumentList($args, false, true, $columnList); + $output = DocumentModel::getDocumentList($args, false, true, $columnList); // get Status name list - $statusNameList = $oDocumentModel->getStatusNameList(); + $statusNameList = DocumentModel::getStatusNameList(); // Set values of document_model::getDocumentList() objects for a template Context::set('total_count', $output->total_count); diff --git a/modules/document/document.model.php b/modules/document/document.model.php index 3e0ba586a..12b5ec590 100644 --- a/modules/document/document.model.php +++ b/modules/document/document.model.php @@ -1535,6 +1535,10 @@ class DocumentModel extends Document } // search division + if(isset($searchOpt->use_division) && $searchOpt->use_division === false) + { + $use_division = false; + } if($use_division) { $document_config = self::getDocumentConfig(); diff --git a/modules/member/member.view.php b/modules/member/member.view.php index a1d05e115..ae8f21a01 100644 --- a/modules/member/member.view.php +++ b/modules/member/member.view.php @@ -539,6 +539,7 @@ class MemberView extends Member $args->module_srl = intval(Context::get('selected_module_srl')) ?: null; $args->sort_index = 'list_order'; $args->statusList = array('PUBLIC', 'SECRET'); + $args->use_division = false; $columnList = array('document_srl', 'module_srl', 'category_srl', 'member_srl', 'title', 'nick_name', 'comment_count', 'trackback_count', 'readed_count', 'voted_count', 'blamed_count', 'regdate', 'ipaddress', 'status'); $output = DocumentModel::getDocumentList($args, false, false, $columnList);