diff --git a/modules/trash/model/TrashVO.php b/modules/trash/model/TrashVO.php index 98296387d..f7b62dbe7 100644 --- a/modules/trash/model/TrashVO.php +++ b/modules/trash/model/TrashVO.php @@ -6,6 +6,7 @@ class TrashVO var $title; var $originModule; var $serializedObject; + var $unserializedObject; var $description; var $ipaddress; var $removerSrl; @@ -47,6 +48,14 @@ class TrashVO { $this->serializedObject = $serializedObject; } + function getUnserializedObject() + { + return $this->unserializedObject; + } + function setUnserializedObject($serializedObject) + { + $this->unserializedObject = unserialize($serializedObject); + } function getDescription() { return htmlspecialchars($this->description, ENT_COMPAT | ENT_HTML401, 'UTF-8', false); diff --git a/modules/trash/tpl/trash_list.html b/modules/trash/tpl/trash_list.html index add8cec8a..64393fdb1 100644 --- a/modules/trash/tpl/trash_list.html +++ b/modules/trash/tpl/trash_list.html @@ -41,7 +41,12 @@ var no_text_comment = '{$lang->no_text_comment}'; {$lang->no_text_comment} - {$oTrashVO->getTitle()} + + + {$module_list[$oTrashVO->unserializedObject['module_srl']]->browser_title} - + + {$oTrashVO->getTitle()} + {$lang->document}{$lang->comment} {$oTrashVO->getNickName()} diff --git a/modules/trash/trash.admin.view.php b/modules/trash/trash.admin.view.php index cb5d2b766..459a24bea 100644 --- a/modules/trash/trash.admin.view.php +++ b/modules/trash/trash.admin.view.php @@ -48,6 +48,31 @@ class trashAdminView extends trash Context::set('page', $output->page); Context::set('page_navigation', $output->page_navigation); + $oModuleModel = getModel('module'); + $module_list = array(); + $mod_srls = array(); + foreach($output->data as $oTrashVO) + { + $mod_srls[] = $oTrashVO->unserializedObject['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); + // 템플릿 파일 지정 $this->setTemplateFile('trash_list'); } diff --git a/modules/trash/trash.model.php b/modules/trash/trash.model.php index 9185d0e51..c56a59349 100644 --- a/modules/trash/trash.model.php +++ b/modules/trash/trash.model.php @@ -87,6 +87,7 @@ class trashModel extends trash $oTrashVO->setTitle($stdObject->title); $oTrashVO->setOriginModule($stdObject->origin_module); $oTrashVO->setSerializedObject($stdObject->serialized_object); + $oTrashVO->setUnserializedObject($stdObject->serialized_object); $oTrashVO->setDescription($stdObject->description); $oTrashVO->setIpaddress($stdObject->ipaddress); $oTrashVO->setRemoverSrl($stdObject->remover_srl);