Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* finish task #2241,2245.

Browse Source
This commit is contained in:
wangyidong
2015-05-08 09:47:39 +08:00
parent ba83f43b15
commit 36a4c32720
15 changed files with 210 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/model.php
+9 -11
View File
@@ -454,28 +454,26 @@ class commonModel extends model
/* Sort the subMenu according to menuOrder. */
if(isset($lang->$moduleName->menuOrder))
{
$menus = $submenus;
$menus = json_decode(json_encode($submenus), true);
$submenus = new stdclass();
ksort($lang->$moduleName->menuOrder, SORT_ASC);
if(isset($menus->list))
if(isset($menus['list']))
{
$submenus->list = $menus->list;
unset($menus->list);
$submenus->list = $menus['list'];
unset($menus['list']);
}
foreach($lang->$moduleName->menuOrder as $order)
{
if(($order != 'list') && isset($menus->$order))
if(($order != 'list') && isset($menus[$order]))
{
$subOrder = $menus->$order;
unset($menus->$order);
$subOrder = $menus[$order];
unset($menus[$order]);
$submenus->$order = $subOrder;
}
}
foreach($menus as $key => $menu)
{
$submenus->$key = $menu;
}
foreach($menus as $key => $menu) $submenus->$key = $menu;
}
/* The beginning of the menu. */