From 1f0a326d1b0e686c065e713f367cda29bd1991bb Mon Sep 17 00:00:00 2001 From: zero Date: Tue, 13 Mar 2007 07:55:22 +0000 Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@397 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/admin/admin.controller.php | 6 +++++- modules/admin/lang/ko.lang.php | 1 + modules/admin/queries/deleteShortCut.xml | 2 +- modules/admin/tpl/filter/delete_shortcut.xml | 2 +- modules/admin/tpl/js/admin.js | 4 ++-- modules/admin/tpl/shortcut_list.html | 4 ++-- 6 files changed, 12 insertions(+), 7 deletions(-) diff --git a/modules/admin/admin.controller.php b/modules/admin/admin.controller.php index a4b3ce38d..5b4c0480c 100644 --- a/modules/admin/admin.controller.php +++ b/modules/admin/admin.controller.php @@ -80,9 +80,13 @@ * @brief 숏컷의 내용 수정 **/ function procDeleteShortCut() { + $oDB = &DB::getInstance(); - $args->shortcut_srl = Context::get('shortcut_srl'); + $args->module = Context::get('selected_module'); + + // 삭제 불가능 바로가기의 처리 + if(in_array($args->module, array('module','addon','plugin','layout'))) return new Object(-1, 'msg_manage_module_cannot_delete'); $output = $oDB->executeQuery('admin.deleteShortCut', $args); if(!$output->toBool()) return $output; diff --git a/modules/admin/lang/ko.lang.php b/modules/admin/lang/ko.lang.php index a9845bd51..af6fe1bac 100644 --- a/modules/admin/lang/ko.lang.php +++ b/modules/admin/lang/ko.lang.php @@ -19,5 +19,6 @@ $lang->installed_path = "설치경로"; $lang->msg_is_not_administrator = '관리자만 접속이 가능합니다'; + $lang->msg_manage_module_cannot_delete = '모듈, 애드온, 레이아웃, 회원관리 모듈의 바로가기는 삭제 불가능합니다'; $lang->msg_default_act_is_null = '기본 관리자 Action이 지정되어 있지 않아 바로가기 등록을 할 수가 없습니다'; ?> diff --git a/modules/admin/queries/deleteShortCut.xml b/modules/admin/queries/deleteShortCut.xml index b037531b7..1ce179c72 100644 --- a/modules/admin/queries/deleteShortCut.xml +++ b/modules/admin/queries/deleteShortCut.xml @@ -3,6 +3,6 @@ - + diff --git a/modules/admin/tpl/filter/delete_shortcut.xml b/modules/admin/tpl/filter/delete_shortcut.xml index a1deb86e6..85995b54c 100644 --- a/modules/admin/tpl/filter/delete_shortcut.xml +++ b/modules/admin/tpl/filter/delete_shortcut.xml @@ -1,6 +1,6 @@
- + diff --git a/modules/admin/tpl/js/admin.js b/modules/admin/tpl/js/admin.js index 505410532..a8ab15b93 100644 --- a/modules/admin/tpl/js/admin.js +++ b/modules/admin/tpl/js/admin.js @@ -19,8 +19,8 @@ function doAdminLoginFocus() { } // 숏컷 삭제 -function doDeleteShortCut(shortcut_srl) { +function doDeleteShortCut(selected_module) { var fo_obj = xGetElementById('fo_shortcut_info'); - fo_obj.shortcut_srl.value = shortcut_srl; + fo_obj.selected_module.value = selected_module; procFilter(fo_obj, delete_shortcut); } diff --git a/modules/admin/tpl/shortcut_list.html b/modules/admin/tpl/shortcut_list.html index 1d42f0ab5..e60ad4593 100644 --- a/modules/admin/tpl/shortcut_list.html +++ b/modules/admin/tpl/shortcut_list.html @@ -5,7 +5,7 @@
- +
@@ -26,7 +26,7 @@
- +
{$shortcut_info->title} {$shortcut_info->module} {zdate($shortcut_info->last_update,"Y-m-d H:i:s")}{$lang->cmd_delete}{$lang->cmd_delete}