diff --git a/modules/trash/lang/ko.php b/modules/trash/lang/ko.php index 21d0d080f..0e9af5772 100644 --- a/modules/trash/lang/ko.php +++ b/modules/trash/lang/ko.php @@ -12,7 +12,7 @@ $lang->fail_empty = '휴지통을 비우지 못했습니다.'; $lang->success_restore = '복원했습니다.'; $lang->fail_restore = '복원하지 못했습니다.'; $lang->origin_module_type = '타입'; -$lang->remove_all_trash_item = '휴지통을 완전히 비웁니다. 실행 후에는 복원이 불가능합니다.'; +$lang->remove_all_trash_item = '선택한 항목의 휴지통 리스트들을 완전히 비웁니다. 실행 후에는 복원이 불가능합니다.'; $lang->title = '제목'; $lang->content = '내용'; $lang->trasher = '삭제자'; @@ -20,3 +20,5 @@ $lang->origin_info = '원문 정보'; $lang->delete_info = '삭제 정보'; $lang->cmd_restore = '복원'; $lang->cmd_trash_list = '휴지통 목록'; +$lang->cmd_trash_type = '휴지통비우기 타입'; +$lang->trash_warning = '주의!'; diff --git a/modules/trash/tpl/trash_list.html b/modules/trash/tpl/trash_list.html index 8aa690460..49d395d62 100644 --- a/modules/trash/tpl/trash_list.html +++ b/modules/trash/tpl/trash_list.html @@ -9,9 +9,21 @@ var no_text_comment = '{$lang->no_text_comment}'; +
+

{$lang->cmd_trash_type}

+
+ + +
+
+

-  {$lang->remove_all_trash_item} +  {$lang->trash_warning}{$lang->remove_all_trash_item}

diff --git a/modules/trash/trash.admin.controller.php b/modules/trash/trash.admin.controller.php index ea37bf41d..88c043dcf 100644 --- a/modules/trash/trash.admin.controller.php +++ b/modules/trash/trash.admin.controller.php @@ -47,16 +47,23 @@ class trashAdminController extends trash $isAll = Context::get('is_all'); $originModule = Context::get('origin_module'); $tmpTrashSrls = Context::get('cart'); + $is_type = Context::get('is_type'); $trashSrls = array(); if($isAll != 'true') { - if(is_array($tmpTrashSrls)) $trashSrls = $tmpTrashSrls; - else $trashSrls = explode('|@|', $tmpTrashSrls); + if(is_array($tmpTrashSrls)) + { + $trashSrls = $tmpTrashSrls; + } + else + { + $trashSrls = explode('|@|', $tmpTrashSrls); + } } //module relation data delete... - $output = $this->_relationDataDelete($isAll, $trashSrls); + $output = $this->_relationDataDelete($isAll, $is_type, $trashSrls); if(!$output->toBool()) return new Object(-1, $output->message); if(!$this->_emptyTrash($trashSrls)) return new Object(-1, $lang->fail_empty); @@ -70,15 +77,19 @@ class trashAdminController extends trash /** * Empty trash - private method * @param string $isAll + * @param string $is_type * @param array trashSrls * @return Object */ - function _relationDataDelete($isAll, &$trashSrls) + function _relationDataDelete($isAll, $is_type, &$trashSrls) { $oTrashModel = getModel('trash'); if($isAll == 'true') { - $output = $oTrashModel->getTrashAllList(array()); + $args = new stdClass(); + $args->originModule = $is_type; + $output = $oTrashModel->getTrashAllList($args); + if(!$output->toBool()) { return new Object(-1, $output->message);