issue 160 many bug fixed

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9405 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2011-09-28 09:21:53 +00:00
parent 4d4a8f1b86
commit 3999db9698
4 changed files with 10 additions and 3 deletions

View file

@ -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' :

View file

@ -152,6 +152,10 @@
}
$menuItem->groupList = $groupList;
$oModuleController = &getController('module');
$menuItem->name_key = $menuItem->name;
$oModuleController->replaceDefinedLangCode($menuItem->name);
$this->add('menu_item', $menuItem);
}

View file

@ -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;

View file

@ -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>