From c249d187a4d8f9afab5834812f602c35ef7c17c9 Mon Sep 17 00:00:00 2001 From: khongchi Date: Mon, 27 Jan 2014 16:50:22 +0900 Subject: [PATCH] =?UTF-8?q?#372=20=EC=84=A4=EC=B9=98=EC=8B=9C=20menu?= =?UTF-8?q?=EB=AA=A8=EB=93=88=EC=9D=B4=20=EC=84=A4=EC=B9=98=EB=90=98?= =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EC=9D=80=20=EC=83=81=ED=83=9C=EC=97=90?= =?UTF-8?q?=EC=84=9C=20'unlinked'=EB=A9=94=EB=89=B4=20=EC=84=A4=EC=A0=95?= =?UTF-8?q?=EC=9D=B4=20=EB=90=98=EC=A7=80=20=EC=95=8A=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/module/module.class.php | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/modules/module/module.class.php b/modules/module/module.class.php index 5e3fcc163..ab1d556ad 100644 --- a/modules/module/module.class.php +++ b/modules/module/module.class.php @@ -437,8 +437,11 @@ class module extends ModuleObject } // menu(sitemap)에 링크되지 않은 모듈인스턴스 링크 - $output1 = $this->linkAllModuleInstancesToSitemap(); - if(!$output1->toBool()) return $output1; + if(Context::isInstalled()) + { + $output1 = $this->linkAllModuleInstancesToSitemap(); + if(!$output1->toBool()) return $output1; + } return new Object(0, 'success_updated'); } @@ -482,20 +485,23 @@ class module extends ModuleObject $temp_menus = executeQueryArray('menu.getMenuByTitle', $args); $args = new stdClass(); - if($temp_menus->data) foreach($temp_menus->data as $menu) + if($temp_menus->toBool()) { - $args->current_menu_srl = $menu->menu_srl; - $args->menu_srl = $moduleConfig->unlinked_menu_srl; - $output3 = executeQuery('menu.updateMenuItems', $args); - - if($output3->toBool()) + foreach($temp_menus->data as $menu) { - // delete - $oMenuAdminController = getAdminController('menu'); - $oMenuAdminController->deleteMenu($menu->menu_srl); + $args->current_menu_srl = $menu->menu_srl; + $args->menu_srl = $moduleConfig->unlinked_menu_srl; + $output3 = executeQuery('menu.updateMenuItems', $args); + + if($output3->toBool()) + { + // delete + $oMenuAdminController = getAdminController('menu'); + $oMenuAdminController->deleteMenu($menu->menu_srl); + } } } - + // menu_srl이 지정되지 않은 mmodule instance가 있는지 검사 $args = new stdClass; $args->site_srl = 0;