fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-17 09:24:17 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue 2511: Make XE menu work with virtual sites too

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@11404 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ucorina 2012-09-20 14:36:17 +00:00
parent de98905c12
commit d3cb41a17b
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/menu/tpl/sitemap.html
View file

@ -18,7 +18,7 @@ jQuery( function() { jQuery('.grant_default').change( function(event) { doShowMe
<input type="hidden" name="act" value="procMenuAdminArrangeItem" />
<input type="hidden" name="menu_srl" value="{$menuSrl}" />
<input type="hidden" name="menu_item_srl" value="" />
<input type="hidden" name="success_return_url" value="{getUrl('', 'module', 'admin', 'act', 'dispMenuAdminSiteMap')}#menuTop_{$menuSrl}" />
<input type="hidden" name="success_return_url" value="{getUrl('', 'module', ($module ? $module : 'admin'), 'act', 'dispMenuAdminSiteMap')}#menuTop_{$menuSrl}" />
<h2 class="h2" id="menuTop_{$menuSrl}"><input name="title" value="{$value->title}" /></h2>
<a href="#nav_{$key}" class="tgMap">{$lang->collapsing}/{$lang->expanding}</a>
@ -43,7 +43,7 @@ jQuery( function() { jQuery('.grant_default').change( function(event) { doShowMe
<input type="hidden" name="module" value="{$module}" />
<input type="hidden" name="act" value="procMenuAdminInsert" />
<input type="hidden" name="title" value="{$lang->untitle}" />
<input type="hidden" name="success_return_url" value="{getUrl('', 'module', 'admin', 'act', 'dispMenuAdminSiteMap')}" />
<input type="hidden" name="success_return_url" value="{getUrl('', 'module', ($module ? $module : 'admin'), 'act', 'dispMenuAdminSiteMap')}" />
<div class="btnArea">
<span class="btn medium"><button type="submit">{$lang->add_new_sitemap}</button></span>
</div>
@ -57,7 +57,7 @@ jQuery( function() { jQuery('.grant_default').change( function(event) { doShowMe
<input type="hidden" name="menu_item_srl" value="{$menu_info->menu_srl}" />
<input type="hidden" name="parent_srl" value="{$menu_info->menu_srl}" />
<input type="hidden" name="module_srl" value="" />
<input type="hidden" name="success_return_url" value="{getUrl('', 'module', 'admin', 'act', 'dispMenuAdminSiteMap')}#menuTop_" />
<input type="hidden" name="success_return_url" value="{getUrl('', 'module', ($module ? $module : 'admin'), 'act', 'dispMenuAdminSiteMap')}#menuTop_" />
<h2 class="h2"><span>{$lang->add_menu}</span><span>{$lang->edit_menu}</span></h2>
<ul>
<li>

3
modules/module/module.admin.controller.php
View file

@ -624,6 +624,7 @@
// Variable setting for site keyword
$site_keyword = Context::get('site_keyword');
$site_srl = Context::get('site_srl');
$vid = Context::get('vid');
// If there is no site keyword, use as information of the current virtual site
$args = null;
$logged_info = Context::get('logged_info');
@ -632,7 +633,7 @@
if(!$site_srl)
{
if($logged_info->is_admin == 'Y' && !$site_keyword) $args->site_srl = 0;
if($logged_info->is_admin == 'Y' && !$site_keyword && !$vid) $args->site_srl = 0;
else $args->site_srl = (int)$site_module_info->site_srl;
}
else $args->site_srl = $site_srl;