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

Implement loading documents from other modules

Browse source
This commit is contained in:
Kijin Sung 2020-10-29 01:04:46 +09:00
parent 264c6f0e74
commit ba971f7b5a
6 changed files with 27 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
modules/board/board.view.php
View file

@ -36,6 +36,11 @@ class boardView extends board
$this->page_count = $this->module_info->page_count;
}
$this->except_notice = $this->module_info->except_notice == 'N' ? FALSE : TRUE;
$this->include_modules = $this->module_info->include_modules ? explode(',', $this->module_info->include_modules) : [];
if (count($this->include_modules) && !in_array($this->module_info->module_srl, $this->include_modules))
{
$this->include_modules[] = $this->module_info->module_srl;
}
// $this->_getStatusNameListecret option backward compatibility
$statusList = $this->_getStatusNameList();
@ -244,7 +249,10 @@ class boardView extends board
// if the module srl is not consistent
if($oDocument->get('module_srl') != $this->module_info->module_srl && $oDocument->get('is_notice') !== 'A')
{
throw new Rhymix\Framework\Exceptions\TargetNotFound;
if (!in_array($oDocument->get('module_srl'), $this->include_modules))
{
throw new Rhymix\Framework\Exceptions\TargetNotFound;
}
}
// check the manage grant
@ -466,7 +474,7 @@ class boardView extends board
// setup module_srl/page number/ list number/ page count
$args = new stdClass();
$args->module_srl = $this->module_srl;
$args->module_srl = $this->include_modules ?: $this->module_srl;
$args->page = intval(Context::get('page')) ?: null;
$args->list_count = $this->list_count;
$args->page_count = $this->page_count;