* finish task #4668.
This commit is contained in:
+1
-18
@@ -364,7 +364,7 @@ class commonModel extends model
|
||||
foreach($items as $subMenuKey => $subMenuLink)
|
||||
{
|
||||
if(is_array($subMenuLink) and isset($subMenuLink['link'])) $subMenuLink = $subMenuLink['link'];
|
||||
$subMenuLink = vsprintf($subMenuLink, $replace);
|
||||
$subMenuLink = sprintf($subMenuLink, $replace);
|
||||
list($subMenuName, $subMenuModule, $subMenuMethod, $subMenuParams) = explode('|', $subMenuLink);
|
||||
|
||||
$link = array();
|
||||
@@ -544,8 +544,6 @@ class commonModel extends model
|
||||
/* Print sub menus. */
|
||||
if(isset($menuItem->subMenu))
|
||||
{
|
||||
$firstLink = '';
|
||||
$firstLabel = '';
|
||||
foreach($menuItem->subMenu as $subMenuItem)
|
||||
{
|
||||
if($subMenuItem->hidden) continue;
|
||||
@@ -564,21 +562,6 @@ class commonModel extends model
|
||||
if($config->global->flow != 'onlyTest' && $currentModule == strtolower($subModule) && $currentMethod == strtolower($subMethod)) $subActive = 'active';
|
||||
|
||||
$subMenu .= "<li class='$subActive' data-id='$subMenuItem->name'>" . html::a($subLink, $subLabel) . '</li>';
|
||||
|
||||
if(!$firstLink) $firstLink = $subLink;
|
||||
if(!$firstLabel) $firstLabel = $subLabel;
|
||||
}
|
||||
|
||||
if(!$firstLink or !$firstLabel) continue;
|
||||
|
||||
if($config->global->flow == 'onlyTest')
|
||||
{
|
||||
$link = $firstLink;
|
||||
}
|
||||
else
|
||||
{
|
||||
$link = $firstLink;
|
||||
$label = $firstLabel;
|
||||
}
|
||||
|
||||
if($subMenu)
|
||||
|
||||
@@ -148,7 +148,18 @@ class projectModel extends model
|
||||
{
|
||||
$subMenu = common::createSubMenu($this->lang->project->subMenu->$key, $projectID);
|
||||
|
||||
if(!empty($subMenu)) $this->lang->project->menu->{$key}['subMenu'] = $subMenu;
|
||||
if(!empty($subMenu))
|
||||
{
|
||||
foreach($subMenu as $menu)
|
||||
{
|
||||
if($moduleName == strtolower($menu->link['module']) and $methodName == strtolower($menu->link['method']))
|
||||
{
|
||||
$this->lang->project->menu->{$key}['link'] = $menu->text . "|" . join('|', $menu->link);
|
||||
break;
|
||||
}
|
||||
}
|
||||
$this->lang->project->menu->{$key}['subMenu'] = $subMenu;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user