diff --git a/modules/comment/comment.admin.view.php b/modules/comment/comment.admin.view.php index 989007633..3cb165997 100644 --- a/modules/comment/comment.admin.view.php +++ b/modules/comment/comment.admin.view.php @@ -52,7 +52,7 @@ class commentAdminView extends comment // get a list by using comment->getCommentList. $oCommentModel = getModel('comment'); $secretNameList = $oCommentModel->getSecretNameList(); - $columnList = array('comment_srl', 'document_srl', 'is_secret', 'status', 'content', 'comments.member_srl', 'comments.nick_name', 'comments.regdate', 'ipaddress', 'voted_count', 'blamed_count'); + $columnList = array('comment_srl', 'document_srl','module_srl','is_secret', 'status', 'content', 'comments.member_srl', 'comments.nick_name', 'comments.regdate', 'ipaddress', 'voted_count', 'blamed_count'); $output = $oCommentModel->getTotalCommentList($args, $columnList); // $modules = $oCommentModel->getDistinctModules(); @@ -66,6 +66,31 @@ class commentAdminView extends comment // Context::set('modules_list', $modules_list); Context::set('page_navigation', $output->page_navigation); Context::set('secret_name_list', $secretNameList); + + $oModuleModel = getModel('module'); + $module_list = array(); + $mod_srls = array(); + foreach($output->data as $val) + { + $mod_srls[] = $val->module_srl; + } + $mod_srls = array_unique($mod_srls); + // Module List + $mod_srls_count = count($mod_srls); + if($mod_srls_count) + { + $columnList = array('module_srl', 'mid', 'browser_title'); + $module_output = $oModuleModel->getModulesInfo($mod_srls, $columnList); + if($module_output && is_array($module_output)) + { + foreach($module_output as $module) + { + $module_list[$module->module_srl] = $module; + } + } + } + Context::set('module_list', $module_list); + // set the template $this->setTemplatePath($this->module_path . 'tpl'); $this->setTemplateFile('comment_list'); diff --git a/modules/comment/tpl/comment_list.html b/modules/comment/tpl/comment_list.html index a4f837619..40f8be128 100644 --- a/modules/comment/tpl/comment_list.html +++ b/modules/comment/tpl/comment_list.html @@ -47,7 +47,12 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}'; {@ $comment = $val->getContentText(200)} - {$comment}{$lang->no_text_comment} + + + {$module_list[$val->module_srl]->browser_title} - + + {$comment}{$lang->no_text_comment} + {$val->getNickName()} {number_format($val->get('voted_count'))}/{number_format($val->get('blamed_count'))} {(zdate($val->regdate,"Y-m-d\nH:i:s"))} diff --git a/modules/document/document.admin.view.php b/modules/document/document.admin.view.php index 2397f2eb1..98547a8e6 100644 --- a/modules/document/document.admin.view.php +++ b/modules/document/document.admin.view.php @@ -50,7 +50,7 @@ class documentAdminView extends document // get a list $oDocumentModel = getModel('document'); - $columnList = array('document_srl', 'title', 'member_srl', 'nick_name', 'readed_count', 'voted_count', 'blamed_count', 'regdate', 'ipaddress', 'status'); + $columnList = array('document_srl', 'module_srl', 'title', 'member_srl', 'nick_name', 'readed_count', 'voted_count', 'blamed_count', 'regdate', 'ipaddress', 'status'); $output = $oDocumentModel->getDocumentList($args, false, true, $columnList); // get Status name list @@ -72,6 +72,30 @@ class documentAdminView extends document } Context::set('search_option', $search_option); + $oModuleModel = getModel('module'); + $module_list = array(); + $mod_srls = array(); + foreach($output->data as $oDocument) + { + $mod_srls[] = $oDocument->get('module_srl'); + } + $mod_srls = array_unique($mod_srls); + // Module List + $mod_srls_count = count($mod_srls); + if($mod_srls_count) + { + $columnList = array('module_srl', 'mid', 'browser_title'); + $module_output = $oModuleModel->getModulesInfo($mod_srls, $columnList); + if($module_output && is_array($module_output)) + { + foreach($module_output as $module) + { + $module_list[$module->module_srl] = $module; + } + } + } + Context::set('module_list', $module_list); + // Specify a template $this->setTemplatePath($this->module_path.'tpl'); $this->setTemplateFile('document_list'); diff --git a/modules/document/tpl/document_list.html b/modules/document/tpl/document_list.html index ba533796d..d9eca400e 100644 --- a/modules/document/tpl/document_list.html +++ b/modules/document/tpl/document_list.html @@ -48,7 +48,11 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}'; - {htmlspecialchars($oDocument->getTitleText())}{$lang->no_title_document} + + + {$module_list[$oDocument->get('module_srl')]->browser_title} - + + {htmlspecialchars($oDocument->getTitleText())}{$lang->no_title_document} {$oDocument->getNickName()} {$oDocument->get('readed_count')} {$oDocument->get('voted_count')}/{$oDocument->get('blamed_count')}