diff --git a/common/lang/en.php b/common/lang/en.php index 927945b3e..56a1765d9 100644 --- a/common/lang/en.php +++ b/common/lang/en.php @@ -167,6 +167,7 @@ $lang->regdate = 'Registered Date'; $lang->anonymous = 'Anonymous'; $lang->last_update = 'Last Update'; $lang->last_post = 'Last Comment'; +$lang->module_title = 'Board Name'; $lang->signup_date = 'Signup Date'; $lang->last_login = 'Last Signin'; $lang->first_page = 'First Page'; diff --git a/common/lang/ko.php b/common/lang/ko.php index 9027c2a4d..57a7f3c45 100644 --- a/common/lang/ko.php +++ b/common/lang/ko.php @@ -169,6 +169,7 @@ $lang->regdate = '등록일'; $lang->anonymous = '익명'; $lang->last_update = '최근 수정일'; $lang->last_post = '마지막 댓글'; +$lang->module_title = '게시판 이름'; $lang->signup_date = '가입일'; $lang->last_login = '최근 로그인'; $lang->first_page = '첫 페이지'; diff --git a/modules/board/board.model.php b/modules/board/board.model.php index 962f05542..f3c95246b 100644 --- a/modules/board/board.model.php +++ b/modules/board/board.model.php @@ -24,7 +24,7 @@ class boardModel extends module $list_config = ModuleModel::getModulePartConfig('board', $module_srl); if(!is_array($list_config) || count($list_config) <= 0) { - $list_config = array('no', 'title', 'nick_name','regdate','readed_count'); + $list_config = array('no', 'title', 'nick_name', 'regdate', 'readed_count'); } // get the extra variables @@ -57,7 +57,7 @@ class boardModel extends module public static function getDefaultListConfig($module_srl) { // add virtual srl, title, registered date, update date, nickname, ID, name, readed count, voted count etc. - $virtual_vars = array( 'no', 'title', 'regdate', 'last_update', 'last_post', 'nick_name', + $virtual_vars = array( 'no', 'title', 'regdate', 'last_update', 'last_post', 'module_title', 'nick_name', 'user_id', 'user_name', 'readed_count', 'voted_count', 'blamed_count', 'thumbnail', 'summary', 'comment_status'); foreach($virtual_vars as $key) { diff --git a/modules/board/board.view.php b/modules/board/board.view.php index 3590dbb70..f83b252b8 100644 --- a/modules/board/board.view.php +++ b/modules/board/board.view.php @@ -453,8 +453,10 @@ class boardView extends board $args = new stdClass(); $args->module_srl = $this->include_modules ?: $this->module_srl; - $notice_output = DocumentModel::getNoticeList($args, $this->columnList); - Context::set('notice_list', $notice_output->data); + $output = DocumentModel::getNoticeList($args, $this->columnList); + $notice_list = $output->data; + $this->_fillModuleTitles($notice_list); + Context::set('notice_list', $notice_list); } /** @@ -569,6 +571,7 @@ class boardView extends board // setup document list variables on context $output = DocumentModel::getDocumentList($args, $this->except_notice, TRUE, $this->columnList); + $this->_fillModuleTitles($output->data); Context::set('document_list', $output->data); Context::set('total_count', $output->total_count); Context::set('total_page', $output->total_page); @@ -576,6 +579,46 @@ class boardView extends board Context::set('page_navigation', $output->page_navigation); } + public function _fillModuleTitles(&$document_list) + { + static $map = null; + + if ($this->include_modules) + { + if ($map === null) + { + $map = []; + $module_titles = ModuleModel::getModulesInfo($this->include_modules, ['module_srl', 'mid', 'browser_title']); + foreach ($module_titles as $module_info) + { + $map[$module_info->module_srl] = $module_info; + } + } + foreach ($document_list as $document) + { + $module_srl = $document->get('module_srl'); + if (isset($map[$module_srl])) + { + $document->add('module_title', $map[$module_srl]->browser_title); + $document->add('mid', $map[$module_srl]->mid); + } + else + { + $document->add('module_title', $this->module_info->browser_title); + $document->add('mid', $this->module_info->mid); + } + } + } + else + { + foreach ($document_list as $document) + { + $document->add('module_title', $this->module_info->browser_title); + $document->add('mid', $this->module_info->mid); + } + } + } + function _makeListColumnList() { $configColumList = array_keys($this->listConfig); diff --git a/modules/board/skins/xedition/list.html b/modules/board/skins/xedition/list.html index 1c22b4b16..06b018b48 100644 --- a/modules/board/skins/xedition/list.html +++ b/modules/board/skins/xedition/list.html @@ -15,6 +15,7 @@