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

* finish task #2797.

Browse Source
This commit is contained in:
wangyidong
2016-11-15 14:02:14 +08:00
parent ff435621c3
commit 49b2e7b9ae
4 changed files with 41 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/custom/model.php
+2 -8
View File
@@ -198,6 +198,8 @@ class customModel extends model
foreach($allMenu as $name => $item)
{
if(is_object($item)) $item = (array)$item;
$label = '';
$module = '';
$method = '';
@@ -205,7 +207,6 @@ class customModel extends model
$fixed = '';
$link = (is_array($item) and isset($item['link'])) ? $item['link'] : $item;
$link = (is_object($item) and isset($item->buildLink)) ? $item->buildLink : $link;
/* The variable of item has not link and is not link then ignore it. */
if(!is_string($link)) continue;
@@ -230,7 +231,6 @@ class customModel extends model
if(isset($item['subModule'])) $itemLink['subModule'] = $item['subModule'];
if(isset($item['alias'])) $itemLink['alias'] = $item['alias'];
if(isset($item['target'])) $itemLink['target'] = $item['target'];
}
}
@@ -239,11 +239,6 @@ class customModel extends model
if(isset($item['float'])) $float = $item['float'];
if(isset($item['fixed'])) $fixed = $item['fixed'];
}
if(is_object($item))
{
if(isset($item->float)) $float = $item->float;
if(isset($item->fixed)) $fixed = $item->fixed;
}
$hidden = !$fixed && isset($customMenuMap[$name]) && isset($customMenuMap[$name]->hidden) && $customMenuMap[$name]->hidden;
if(strpos($name, 'QUERY') === 0 and !isset($customMenuMap[$name])) $hidden = true;
@@ -256,7 +251,6 @@ class customModel extends model
if($float) $menuItem->float = $float;
if($fixed) $menuItem->fixed = $fixed;
if($hidden) $menuItem->hidden = $hidden;
if(is_object($item) and isset($item->buildLink)) $menuItem->buildLink = $item->buildLink;
if($isTutorialMode) $menuItem->tutorial = true;
while(isset($menu[$menuItem->order])) $menuItem->order++;