diff --git a/modules/document/document.admin.view.php b/modules/document/document.admin.view.php index 1c5ea201d..76a827b7d 100644 --- a/modules/document/document.admin.view.php +++ b/modules/document/document.admin.view.php @@ -40,9 +40,18 @@ class documentAdminView extends document $args->page = Context::get('page'); // /< Page $args->list_count = 30; // /< the number of posts to display on a single page $args->page_count = 5; // /< the number of pages that appear in the page navigation - + $args->search_target = Context::get('search_target'); // /< search (title, contents ...) $args->search_keyword = Context::get('search_keyword'); // /< keyword to search + if ($args->search_target === 'member_srl') + { + $logged_info = Context::get('logged_info'); + if ($logged_info->is_admin === 'Y' || intval($logged_info->member_srl) === intval($args->search_keyword)) + { + $args->member_srl = array(intval($args->search_keyword), intval($args->search_keyword) * -1); + unset($args->search_target, $args->search_keyword); + } + } $args->sort_index = 'list_order'; // /< sorting value diff --git a/modules/document/document.model.php b/modules/document/document.model.php index eb23d1861..8c33bbbe0 100644 --- a/modules/document/document.model.php +++ b/modules/document/document.model.php @@ -1325,7 +1325,7 @@ class documentModel extends document if($searchOpt->mid) { $oModuleModel = getModel('module'); - $args->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid); + $args->module_srl = $oModuleModel->getModuleSrlByMid($searchOpt->mid); unset($searchOpt->mid); } diff --git a/modules/document/queries/getDocumentList.xml b/modules/document/queries/getDocumentList.xml index 39400b145..5919beab0 100644 --- a/modules/document/queries/getDocumentList.xml +++ b/modules/document/queries/getDocumentList.xml @@ -10,7 +10,7 @@ - + diff --git a/modules/member/member.view.php b/modules/member/member.view.php index ce172f28e..361ef03f1 100644 --- a/modules/member/member.view.php +++ b/modules/member/member.view.php @@ -358,9 +358,11 @@ class memberView extends member */ function dispMemberOwnDocument() { - $oMemberModel = getModel('member'); // A message appears if the user is not logged-in - if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged'); + if(!Context::get('is_logged')) + { + return new Object(-1, 'msg_not_logged'); + } $logged_info = Context::get('logged_info'); $member_srl = $logged_info->member_srl;