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

issue 2668 sitemap sort change

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12157 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2012-11-09 09:38:34 +00:00
parent b65e0e1ed9
commit 9f5356bca1
2 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

23
modules/menu/menu.admin.model.php
View file

@ -8,6 +8,8 @@
* @version 0.1 * @version 0.1
*/ */
class menuAdminModel extends menu { class menuAdminModel extends menu {
private $menuSrlWithinHome = 0;
/** /**
* Initialization * Initialization
* @return void * @return void
@ -374,7 +376,7 @@
{ {
foreach($menu->list AS $key=>$value) foreach($menu->list AS $key=>$value)
{ {
$this->_menuInfoSetting($menu->list[$key], $start_module, $isMenuFixed); $this->_menuInfoSetting($menu->list[$key], $start_module, $isMenuFixed, $menuSrl);
} }
} }
@ -414,7 +416,7 @@
{ {
foreach($menu->list AS $key2=>$value2) foreach($menu->list AS $key2=>$value2)
{ {
$this->_menuInfoSetting($menu->list[$key2], $start_module, $isMenuFixed); $this->_menuInfoSetting($menu->list[$key2], $start_module, $isMenuFixed, $value->menu_srl);
} }
} }
@ -427,11 +429,21 @@
$menuItems->menuSrl = $value->menu_srl; $menuItems->menuSrl = $value->menu_srl;
$menuItems->title = $value->title; $menuItems->title = $value->title;
$menuItems->menuItems = $menu; $menuItems->menuItems = $menu;
array_push($menuList, $menuItems);
if($value->menu_srl == $this->menuSrlWithinHome)
{
$menuList[-1] = $menuItems;
}
else
{
array_push($menuList, $menuItems);
}
} }
} }
} }
} }
ksort($menuList);
$this->add('menuList', $menuList); $this->add('menuList', $menuList);
} }
@ -473,7 +485,7 @@
* @param array $menu * @param array $menu
* @return void * @return void
*/ */
private function _menuInfoSetting(&$menu, &$start_module, &$isMenuFixed) private function _menuInfoSetting(&$menu, &$start_module, &$isMenuFixed, $menuSrl)
{ {
$oModuleModel = &getModel('module'); $oModuleModel = &getModel('module');
// if url is empty and is_shortcut is 'N', change to is_shortcut 'Y' // if url is empty and is_shortcut is 'N', change to is_shortcut 'Y'
@ -515,6 +527,7 @@
if($menu['is_shortcut'] == 'N' && $midInfo->mid == $start_module->mid) if($menu['is_shortcut'] == 'N' && $midInfo->mid == $start_module->mid)
{ {
$menu['is_start_module'] = true; $menu['is_start_module'] = true;
$this->menuSrlWithinHome = $menuSrl;
} }
// setting layout srl for layout management // setting layout srl for layout management
$menu['layout_srl'] = $midInfo->layout_srl; $menu['layout_srl'] = $midInfo->layout_srl;
@ -523,7 +536,7 @@
{ {
foreach($menu['list'] AS $key=>$value) foreach($menu['list'] AS $key=>$value)
{ {
$this->_menuInfoSetting($menu['list'][$key], &$start_module, $isMenuFixed); $this->_menuInfoSetting($menu['list'][$key], &$start_module, $isMenuFixed, $menuSrl);
} }
} }
} }

2
modules/menu/queries/getMenus.xml
View file

@ -10,6 +10,6 @@
<condition operation="notequal" column="title" default="__ADMINMENU_V17__" pipe="and" /> <condition operation="notequal" column="title" default="__ADMINMENU_V17__" pipe="and" />
</conditions> </conditions>
<navigation> <navigation>
<index var="sort_index" default="listorder" order="asc" /> <index var="sort_index" default="listorder" order="desc" />
</navigation> </navigation>
</query> </query>