From 0f262440cc3bc1d15238e642dd3fd7329371fb1b Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Tue, 17 Apr 2007 01:56:24 +0000
Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@1189
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 modules/menu/menu.controller.php          | 8 +++++---
 modules/menu/queries/deleteMenuLayout.xml | 2 +-
 modules/menu/tpl/menu_management.html     | 2 +-
 modules/module/module.controller.php      | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/modules/menu/menu.controller.php b/modules/menu/menu.controller.php
index 5c7f8fac7..02a65fa9f 100644
--- a/modules/menu/menu.controller.php
+++ b/modules/menu/menu.controller.php
@@ -136,7 +136,7 @@
 
                 // 해당 mid의 메뉴값을 선택된 메뉴로 변경
                 $oModuleController = &getController('module');
-                $oModuleController->updateModuleMenu($args);
+                $oModuleController->updateModuleMenu($mid_args);
             }
 
             $this->add('xml_file', $xml_file);
@@ -403,13 +403,15 @@
          * 레이아웃에서 메뉴를 지정할때 지정된 메뉴의 기본 레이아웃을 매핑
          **/
         function updateMenuLayout($layout_srl, $menu_srl_list) {
-            if(!count($menu_srls)) return;
+            if(!count($menu_srl_list)) return;
 
             // 일단 menu_srls의 값을 지움
-            $args->menu_srls = $menu_srls;
+            $args->menu_srls = implode(',',$menu_srl_list);
             $output = executeQuery('menu.deleteMenuLayout', $args);
             if(!$output->toBool()) return $output;
 
+            $args->layout_srl = $layout_srl;
+
             // menu_srls, layout_srl 매핑
             for($i=0;$i<count($menu_srl_list);$i++) {
                 $args->menu_srl = $menu_srl_list[$i];
diff --git a/modules/menu/queries/deleteMenuLayout.xml b/modules/menu/queries/deleteMenuLayout.xml
index 9fdb8ec9f..178be8fe4 100644
--- a/modules/menu/queries/deleteMenuLayout.xml
+++ b/modules/menu/queries/deleteMenuLayout.xml
@@ -3,6 +3,6 @@
         <table name="menu_layout" />
     </tables>
     <conditions>
-        <condition operation="equal" column="menu_srl" var="menu_srl" filter="number" notnull="notnull" />
+        <condition operation="in" column="menu_srl" var="menu_srls" filter="number" notnull="notnull" />
     </conditions>
 </query>
diff --git a/modules/menu/tpl/menu_management.html b/modules/menu/tpl/menu_management.html
index 11da05d33..adaf23c4c 100644
--- a/modules/menu/tpl/menu_management.html
+++ b/modules/menu/tpl/menu_management.html
@@ -47,7 +47,7 @@
                     <input type="checkbox" id="menu_enable_move" /> <label for="menu_enable_move">{$lang->cmd_enable_move_menu}</label>
                 </div>
                 <div>
-                    <input type="button" value="{$lang->cmd_insert}" onclick="doInsertMenuItem('menu');return false;" />
+                    <input type="button" value="{$lang->cmd_insert}" onclick="doInsertMenuItem(0);return false;" />
                     <input type="button" value="{$lang->cmd_open_all}" onclick="openAllTreeMenu('menu');return false;" />
                     <input type="button" value="{$lang->cmd_close_all}" onclick="closeAllTreeMenu('menu');return false;" />
                     <input type="button" value="{$lang->cmd_remake_cache}" onclick="doReloadTreeMenu('{$menu_info->menu_srl}');return false;" />
diff --git a/modules/module/module.controller.php b/modules/module/module.controller.php
index 167c55148..6ae882029 100644
--- a/modules/module/module.controller.php
+++ b/modules/module/module.controller.php
@@ -280,7 +280,7 @@
          * @brief 지정된 menu_srl에 속한 mid 의 layout_srl을 변경 
          **/
         function updateModuleLayout($layout_srl, $menu_srl_list) {
-            if(!count($menu_srls)) return;
+            if(!count($menu_srl_list)) return;
 
             $args->layout_srl = $layout_srl;
             $args->menu_srls = implode(',',$menu_srl_list);