fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-10 20:44:28 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #854 from bjrambo/pr/document

Browse source 
회원의 익명글도 확인할 수 있도록 개선
This commit is contained in:
BJRambo 2017-06-21 17:56:37 +09:00 • committed by GitHub
commit 1f605dd396
4 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

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

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

2
modules/document/queries/getDocumentList.xml
View file

@ -10,7 +10,7 @@
<condition operation="notin" column="module_srl" var="exclude_module_srl" filter="number" pipe="and" />
<condition operation="in" column="category_srl" var="category_srl" pipe="and" />
<condition operation="equal" column="is_notice" var="s_is_notice" pipe="and" />
<condition operation="equal" column="member_srl" var="member_srl" filter="number" pipe="and" />
<condition operation="in" column="member_srl" var="member_srl" pipe="and" />
<condition operation="in" column="status" var="statusList" pipe="and" />
<group pipe="and">
<condition operation="more" column="list_order" var="division" pipe="and" />

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

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