Fix #1569 add option to control whether notices are included in combined board

This commit is contained in:
Kijin Sung 2021-01-19 21:22:31 +09:00
parent 06f973d227
commit 77403f384a
5 changed files with 23 additions and 3 deletions

View file

@ -464,7 +464,14 @@ class boardView extends board
}
$args = new stdClass();
$args->module_srl = $this->include_modules ?: $this->module_srl;
if (isset($this->module_info->include_notice) && $this->module_info->include_notice === 'N')
{
$args->module_srl = $this->module_srl;
}
else
{
$args->module_srl = $this->include_modules ?: $this->module_srl;
}
$output = DocumentModel::getNoticeList($args, $this->columnList);
$notice_list = $output->data;
$this->_fillModuleTitles($notice_list);