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

Fix partial search result in admin document list and member document list

Browse source
This commit is contained in:
Kijin Sung 2023-12-30 20:56:24 +09:00
parent c7811969ba
commit 9aaf785309
3 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/document/document.admin.view.php
View file

@ -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);

4
modules/document/document.model.php
View file

@ -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();

1
modules/member/member.view.php
View file

@ -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);