diff --git a/modules/module/queries/insertModule.xml b/modules/module/queries/insertModule.xml index e7dd470d7..eb4b3adb3 100644 --- a/modules/module/queries/insertModule.xml +++ b/modules/module/queries/insertModule.xml @@ -9,6 +9,7 @@ + diff --git a/modules/module/queries/updateModule.xml b/modules/module/queries/updateModule.xml index 0684394f1..125cc8845 100644 --- a/modules/module/queries/updateModule.xml +++ b/modules/module/queries/updateModule.xml @@ -8,6 +8,7 @@ + diff --git a/modules/pagemaker/conf/module.xml b/modules/pagemaker/conf/module.xml index 268fc2f3b..561fbbe7a 100644 --- a/modules/pagemaker/conf/module.xml +++ b/modules/pagemaker/conf/module.xml @@ -4,11 +4,11 @@ - - - - - + + + + + diff --git a/modules/pagemaker/pagemaker.controller.php b/modules/pagemaker/pagemaker.controller.php index a2b18c38b..d420ed64d 100644 --- a/modules/pagemaker/pagemaker.controller.php +++ b/modules/pagemaker/pagemaker.controller.php @@ -18,20 +18,12 @@ **/ function procInsertBoard() { // 일단 입력된 값들을 모두 받아서 db 입력항목과 그외 것으로 분리 - $args = Context::gets('module_srl','layout_srl','module_category_srl','page_name','skin','browser_title','description','is_default','header_text','footer_text','admin_id'); + $args = Context::gets('module_srl','layout_srl','module_category_srl','page_name','browser_title','content','is_default'); $args->module = 'page'; $args->mid = $args->page_name; unset($args->page_name); if($args->is_default!='Y') $args->is_default = 'N'; - // 기본 값외의 것들을 정리 - $extra_var = delObjectVars(Context::getRequestVars(), $args); - if($extra_var->use_category!='Y') $extra_var->use_category = 'N'; - unset($extra_var->mo); - unset($extra_var->act); - unset($extra_var->page); - unset($extra_var->page_name); - // module_srl이 넘어오면 원 모듈이 있는지 확인 if($args->module_srl) { $oModuleModel = &getModel('module'); @@ -41,9 +33,6 @@ if($module_info->module_srl != $args->module_srl) unset($args->module_srl); } - // $extra_var를 serialize - $args->extra_vars = serialize($extra_var); - // module 모듈의 controller 객체 생성 $oModuleController = &getController('module'); @@ -61,8 +50,6 @@ if(!$output->toBool()) return $output; - $this->add('page',Context::get('page')); - $this->add('module_srl',$output->get('module_srl')); $this->setMessage($msg_code); } diff --git a/modules/pagemaker/pagemaker.view.php b/modules/pagemaker/pagemaker.view.php index 659bad78e..943654864 100644 --- a/modules/pagemaker/pagemaker.view.php +++ b/modules/pagemaker/pagemaker.view.php @@ -87,7 +87,7 @@ /** * @brief 선택된 페이지의 정보 출력 **/ - function dispAdminBoardInfo() { + function dispAdminPageInfo() { // 관리자 관련 정보 세팅 $this->initAdmin(); @@ -109,7 +109,7 @@ /** * @brief 페이지 추가 폼 출력 **/ - function dispAdminInsertBoard() { + function dispAdminInsertPage() { // 관리자 관련 정보 세팅 $this->initAdmin(); @@ -152,7 +152,7 @@ /** * @brief 페이지 삭제 화면 출력 **/ - function dispAdminDeleteBoard() { + function dispAdminDeletePage() { // 관리자 관련 정보 세팅 $this->initAdmin(); diff --git a/modules/pagemaker/tpl.admin/filter/delete_page.xml b/modules/pagemaker/tpl.admin/filter/delete_page.xml index f67032d67..a625bd23e 100644 --- a/modules/pagemaker/tpl.admin/filter/delete_page.xml +++ b/modules/pagemaker/tpl.admin/filter/delete_page.xml @@ -1,4 +1,4 @@ - +
diff --git a/modules/pagemaker/tpl.admin/filter/insert_config.xml b/modules/pagemaker/tpl.admin/filter/insert_config.xml index b97a3e897..e12b08711 100644 --- a/modules/pagemaker/tpl.admin/filter/insert_config.xml +++ b/modules/pagemaker/tpl.admin/filter/insert_config.xml @@ -1,4 +1,4 @@ - +
diff --git a/modules/pagemaker/tpl.admin/filter/insert_page.xml b/modules/pagemaker/tpl.admin/filter/insert_page.xml index 40368c27e..cc9243a51 100644 --- a/modules/pagemaker/tpl.admin/filter/insert_page.xml +++ b/modules/pagemaker/tpl.admin/filter/insert_page.xml @@ -1,32 +1,20 @@ - + - - + - - - - - - - - + - + - - - - diff --git a/modules/pagemaker/tpl.admin/js/admin.js b/modules/pagemaker/tpl.admin/js/admin.js index f41590eb5..d980199ae 100644 --- a/modules/pagemaker/tpl.admin/js/admin.js +++ b/modules/pagemaker/tpl.admin/js/admin.js @@ -4,22 +4,6 @@ * @desc : pagemaker 모듈의 관리자용 javascript **/ -/* 모듈 생성 후 */ -function completeInsertPage(ret_obj) { - var error = ret_obj['error']; - var message = ret_obj['message']; - - var page = ret_obj['page']; - var module_srl = ret_obj['module_srl']; - - alert(message); - - var url = "./?module=admin&mo=pagemaker&module_srl="+module_srl+"&act=dispAdminPageInfo"; - if(page) url += "&page="+page; - - location.href = url; -} - /* 모듈 삭제 후 */ function completeDeletePage(ret_obj) { var error = ret_obj['error'];