issue 160 admin setup bug fix

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9154 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2011-09-15 07:57:00 +00:00
parent 562b227f74
commit ea20e214ba
5 changed files with 13 additions and 8 deletions

View file

@ -403,6 +403,7 @@
$output = $oMenuAdminModel->getMenuByTitle('__XE_ADMIN__');
Context::set('menu_srl', $output->menu_srl);
Context::set('menu_title', $output->title);
Context::set('config_object', $configObject);
$this->setTemplateFile('admin_setup');
}

View file

@ -32,6 +32,7 @@
<form id="listForm" action="./" class="siteMap" method="post">
<input type="hidden" name="act" value="procMenuAdminDeleteItem" />
<input type="hidden" name="menu_srl" value="{$menu_srl}" />
<input type="hidden" name="title" value="{$menu_title}" />
<input type="hidden" name="menu_item_srl" value="" />
<input type="hidden" name="success_return_url" value="{getUrl('', 'module', 'admin', 'act', 'dispAdminSetup')}" />
<fieldset class="section">
@ -39,11 +40,15 @@
<div class="adminMenu portlet">
<ul class="lined">
<li class="parent" loop="$gnbUrlList=>$key,$value">
<input type="hidden" name="parent_key[]" value="{$key}" class="_parent_key" />
<input type="hidden" name="child_key[]" value="BEGIN_{$key}" />
<input type="hidden" name="parent_key[]" value="{$value['parent_srl']}" class="_parent_key" />
<input type="hidden" name="item_key[]" value="{$value['node_srl']}" class="_item_key" />
<span>{$value['text']}</span> <span class="side"><a href="#editMenu" class="modalAnchor _add">{$lang->add}</a></span>
<ul cond="is_array($value['list']) && count($value['list'])>0">
<li loop="$value['list']=>$key2,$value2"><span>{$value2['text']}</span><span class="side"><a href="#delete" class="_child_delete">{$lang->delete}</a></span><input type="hidden" name="child_key[]" value="{$key2}" class="_child_key" /></li>
<li loop="$value['list']=>$key2,$value2">
<input type="hidden" name="parent_key[]" value="{$value2['parent_srl']}" class="_parent_key" />
<input type="hidden" name="item_key[]" value="{$value2['node_srl']}" class="_item_key" />
<span>{$value2['text']}</span><span class="side"><a href="#delete" class="_child_delete">{$lang->delete}</a></span>
</li>
</ul>
</li>
</ul>

View file

@ -5,7 +5,7 @@ jQuery(function($){
var listForm = $('#listForm');
$('a._add').click(function(){
parentSrl = $(this).parent().prevAll('._parent_key').val();
parentSrl = $(this).parent().prevAll('._item_key').val();
editForm.find('input[name=parent_srl]').val(parentSrl);
if(!menuList)
{
@ -40,7 +40,7 @@ jQuery(function($){
});
$('a._child_delete').click(function() {
var menu_item_srl = $(this).parents('li').find('._child_key').val();
var menu_item_srl = $(this).parents('li').find('._item_key').val();
listForm.find('input[name=menu_item_srl]').val(menu_item_srl);
listForm.submit();
});

View file

@ -504,8 +504,8 @@
$groupSrlList = $oMemberModel->getMemberGroups($logged_info->member_srl);
//preg_match('/\{\$lang->menu_gnb\[(.*?)\]\}/i', $parentMenuInfo->name, $m);
$cache_file = sprintf("./files/cache/module_info/%s.%s.php", $moduleName, Context::getLangType());
include $cache_file;
$oModuleModel = &getModel('module');
$info = $oModuleModel->getModuleInfoXml($moduleName);
$args->menu_item_srl = (!$requestArgs->menu_item_srl) ? getNextSequence() : $requestArgs->menu_item_srl;
$args->parent_srl = $requestArgs->parent_srl;

View file

@ -38,7 +38,6 @@ $('form.siteMap')
function completeGetActList(obj)
{
var menuItem = obj.menu_item;
console.log(menuItem);
menuUrl = menuItem.url;
editForm.find('.h2').html('Edit Menu');
editForm.find('input[name=menu_srl]').val(menuItem.menu_srl);