diff --git a/modules/board/board.controller.php b/modules/board/board.controller.php index ae9176faf..be3c3190e 100644 --- a/modules/board/board.controller.php +++ b/modules/board/board.controller.php @@ -292,10 +292,8 @@ class boardController extends board } } // generate document module controller object - $oTrashModel = getModel('trash'); - $config = $oTrashModel->getConfig(); $oDocumentController = getController('document'); - if($config->trash_use == 'Y') + if($this->module_info->trash_use == 'Y') { // move the trash $output = $oDocumentController->moveDocumentToTrash($oDocument); diff --git a/modules/board/lang/ko.php b/modules/board/lang/ko.php index b0c8c3414..be88e8b64 100644 --- a/modules/board/lang/ko.php +++ b/modules/board/lang/ko.php @@ -69,3 +69,5 @@ $lang->msg_admin_update_log = '관리자가 수정한 적이 있는 게시물입 $lang->msg_update_log_revert = '정말로 이 버전으로 되돌리시겠습니까?'; $lang->write_admin = '관리자작성'; $lang->revert_reason_update = '이 버전으로 되돌림'; +$lang->document_force_to_move = '삭제시 휴지통으로 강제이동'; +$lang->about_document_force_to_move = '게시글을 삭제시 휴지통으로 강제이동할지 않할지를 선택하는 옵션입니다.'; diff --git a/modules/board/tpl/board_insert.html b/modules/board/tpl/board_insert.html index 39a4ab1b3..811ee6f62 100644 --- a/modules/board/tpl/board_insert.html +++ b/modules/board/tpl/board_insert.html @@ -238,6 +238,18 @@

{$lang->msg_warning_update_log}

+
+ +
+ + +

{$lang->about_document_force_to_move}

+
+
diff --git a/modules/trash/conf/module.xml b/modules/trash/conf/module.xml index 2f1dd69a2..5ffec0ed9 100644 --- a/modules/trash/conf/module.xml +++ b/modules/trash/conf/module.xml @@ -7,12 +7,10 @@ - - diff --git a/modules/trash/lang/ko.php b/modules/trash/lang/ko.php index e0fc7a2c5..21d0d080f 100644 --- a/modules/trash/lang/ko.php +++ b/modules/trash/lang/ko.php @@ -19,9 +19,4 @@ $lang->trasher = '삭제자'; $lang->origin_info = '원문 정보'; $lang->delete_info = '삭제 정보'; $lang->cmd_restore = '복원'; -$lang->cmd_trash_setting = '휴지통 설정'; $lang->cmd_trash_list = '휴지통 목록'; -$lang->document_force_to_move = '삭제시 휴지통으로 강제이동'; -$lang->force_to_move = '휴지통으로 강제이동'; -$lang->do_not_forceto_move = '강제이동을 하지않음'; -$lang->about_document_force_to_move = '게시글을 삭제시 휴지통으로 강제이동할지 않할지를 선택하는 옵션입니다.'; diff --git a/modules/trash/tpl/config.html b/modules/trash/tpl/config.html deleted file mode 100644 index 574ae1cc0..000000000 --- a/modules/trash/tpl/config.html +++ /dev/null @@ -1,25 +0,0 @@ - - -
- - -
-
- -
- - -

{$lang->about_document_force_to_move}

-
-
-
-
-
- -
-
-
diff --git a/modules/trash/tpl/header.html b/modules/trash/tpl/header.html index 020b6e302..d2b0ac8ff 100644 --- a/modules/trash/tpl/header.html +++ b/modules/trash/tpl/header.html @@ -6,7 +6,6 @@ diff --git a/modules/trash/tpl/trash_list.html b/modules/trash/tpl/trash_list.html index 0807e73aa..9ec67652a 100644 --- a/modules/trash/tpl/trash_list.html +++ b/modules/trash/tpl/trash_list.html @@ -3,7 +3,6 @@ var confirm_restore_msg = '{$lang->confirm_restore}'; var no_text_comment = '{$lang->no_text_comment}'; -
diff --git a/modules/trash/trash.admin.controller.php b/modules/trash/trash.admin.controller.php index 6eab3cc60..ea37bf41d 100644 --- a/modules/trash/trash.admin.controller.php +++ b/modules/trash/trash.admin.controller.php @@ -226,30 +226,6 @@ class trashAdminController extends trash return true; } - - /** - * set trash module config - * @return void|Object - */ - function procTrashAdminConfig() - { - $oTrashModel = getModel('trash'); - $config = $oTrashModel->getConfig(); - $oModuleController = getController('module'); - - $obj = Context::getRequestVars(); - - $config->trash_use = $obj->trash_use; - - $output = $oModuleController->updateModuleConfig('trash', $config); - if(!$output->toBool()) - { - $this->setMessage('success_updated'); - } - - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispTrashAdminConfig'); - $this->setRedirectUrl($returnUrl); - } } /* End of file trash.admin.controller.php */ /* Location: ./modules/trash/trash.admin.controller.php */ diff --git a/modules/trash/trash.admin.view.php b/modules/trash/trash.admin.view.php index c5b2e8f3a..82ea6d814 100644 --- a/modules/trash/trash.admin.view.php +++ b/modules/trash/trash.admin.view.php @@ -110,16 +110,6 @@ class trashAdminView extends trash } $this->setTemplateFile('trash_view'); } - - function dispTrashAdminConfig() - { - $oTrashModel = getModel('trash'); - $config = $oTrashModel->getConfig(); - - Context::set('config', $config); - - $this->setTemplateFile('config'); - } } /* End of file trash.admin.view.php */ /* Location: ./modules/trash/trash.admin.view.php */