From 3999db9698e5baf612cbfcb0c25582ba848c6fb5 Mon Sep 17 00:00:00 2001
From: ovclas <ovclas@gmail.com>
Date: Wed, 28 Sep 2011 09:21:53 +0000
Subject: [PATCH] issue 160 many bug fixed

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9405 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/menu/menu.admin.controller.php | 4 ++--
 modules/menu/menu.admin.model.php      | 4 ++++
 modules/menu/tpl/js/sitemap.js         | 1 +
 modules/menu/tpl/sitemap.html          | 4 +++-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/modules/menu/menu.admin.controller.php b/modules/menu/menu.admin.controller.php
index 76f453f33..ffb64bd6b 100644
--- a/modules/menu/menu.admin.controller.php
+++ b/modules/menu/menu.admin.controller.php
@@ -133,7 +133,7 @@
             $args->parent_srl = $source_args->parent_srl;
             $args->menu_srl = $source_args->menu_srl;
             $args->menu_id = $source_args->menu_id;
-            $args->name = $source_args->menu_name;
+            $args->name = $source_args->menu_name_key;
             $args->url = trim($source_args->menu_url);
             $args->open_window = $source_args->menu_open_window;
             $args->expand = $source_args->menu_expand;
@@ -148,7 +148,7 @@
 				$site_module_info = Context::get('site_module_info');
 				$cmArgs->site_srl = (int)$site_module_info->site_srl;
 				$cmArgs->mid = $source_args->create_menu_url;
-				$cmArgs->browser_title = $source_args->menu_name;
+				$cmArgs->browser_title = $source_args->menu_name_key;
 
 				switch ($source_args->module_type){
 					case 'WIDGET' :
diff --git a/modules/menu/menu.admin.model.php b/modules/menu/menu.admin.model.php
index b67052009..e55cafb60 100644
--- a/modules/menu/menu.admin.model.php
+++ b/modules/menu/menu.admin.model.php
@@ -152,6 +152,10 @@
 			}
 			$menuItem->groupList = $groupList;
 
+			$oModuleController = &getController('module');
+			$menuItem->name_key = $menuItem->name;
+			$oModuleController->replaceDefinedLangCode($menuItem->name);
+
 			$this->add('menu_item', $menuItem);
         }
 
diff --git a/modules/menu/tpl/js/sitemap.js b/modules/menu/tpl/js/sitemap.js
index 06a6097e9..5211aaf89 100644
--- a/modules/menu/tpl/js/sitemap.js
+++ b/modules/menu/tpl/js/sitemap.js
@@ -43,6 +43,7 @@ $('form.siteMap')
 		editForm.find('input[name=menu_srl]').val(menuItem.menu_srl);
 		editForm.find('input[name=menu_item_srl]').val(menuItem.menu_item_srl);
 		editForm.find('input[name=parent_srl]').val(menuItem.parent_srl);
+		editForm.find('input[name=menu_name_key]').val(menuItem.name_key);
 		editForm.find('input[name=menu_name]').val(menuItem.name);
 
 		var moduleType = menuItem.moduleType;
diff --git a/modules/menu/tpl/sitemap.html b/modules/menu/tpl/sitemap.html
index a3e73f0ba..cfcd76a8a 100644
--- a/modules/menu/tpl/sitemap.html
+++ b/modules/menu/tpl/sitemap.html
@@ -97,12 +97,14 @@ xe.lang.confirm_delete = "{$lang->confirm_delete}";
 					<p class="q"><label for="kModule">{$lang->select_module}</label></p>
 					<p class="a">
 						<select style="width:290px" id="kModule" name="module_type">
+							<block loop="$module_list=>$key,$value">
 							<optgroup label="page" cond="$key=='page'">
 								<option value="WIDGET">{$lang->page_type_name['WIDGET']}</option>
 								<option value="ARTICLE">{$lang->page_type_name['ARTICLE']}</option>
 								<option value="OUTSIDE">{$lang->page_type_name['OUTSIDE']}</option>
 							</optgroup>
-							<option loop="$module_list=>$key,$value" value="{$key}" cond="$key!='page'">{$value->title}</option>
+							<option value="{$key}" cond="$key!='page'">{$value->title}</option>
+							</block>
 						</select>
 					</p>
 				</li>