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

* Ajdust openApp logic.

Browse Source
This commit is contained in:
zhujinyong
2021-03-31 16:07:11 +08:00
parent bd991f876e
commit d966b2e214
8 changed files with 33 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/model.php
+7 -20
View File
@@ -33,7 +33,6 @@ class commonModel extends model
$this->loadCustomFromDB();
if(!$this->checkIP()) die($this->lang->ipLimited);
$this->app->loadLang('company');
$this->setOpenApp();
}
}
@@ -116,21 +115,6 @@ class commonModel extends model
}
}
/**
* Set openApp.
*
* @access public
* @return void
*/
public function setOpenApp()
{
$openApp = $this->app->openApp;
if(isset($this->lang->navGroup->$openApp))
{
$this->app->openApp = $this->lang->navGroup->$openApp;
}
}
/**
* Load configs from database and save it to config->system and config->personal.
*
@@ -829,7 +813,7 @@ class commonModel extends model
}
if($module == $currentModule and ($method == $currentMethod or strpos(",$alias,", ",$currentMethod,") !== false)) $active = 'active';
$label = $menuItem->text;
$label = $menuItem->text;
$dropMenu = '';
/* Print sub menus. */
if(isset($menuItem->dropMenu))
@@ -851,7 +835,8 @@ class commonModel extends model
if($currentModule == strtolower($subModule) && $currentMethod == strtolower($subMethod)) $subActive = 'active';
$dropMenu .= "<li class='$subActive' data-id='$dropMenuItem->name'>" . html::a($subLink, $subLabel) . '</li>';
$misc = (isset($lang->navGroup->$subModule) and $openApp != $lang->navGroup->$subModule) ? "data-app='$openApp'" : '';
$dropMenu .= "<li class='$subActive' data-id='$dropMenuItem->name'>" . html::a($subLink, $subLabel, '', $misc) . '</li>';
}
if(empty($dropMenu)) continue;
@@ -860,8 +845,10 @@ class commonModel extends model
$dropMenu = "<ul class='dropdown-menu'>{$dropMenu}</ul>";
}
$menuItemHtml = "<li class='$class $active' data-id='$menuItem->name'>" . html::a($link, $label, $target) . $dropMenu . "</li>\n";
if($isMobile) $menuItemHtml = html::a($link, $menuItem->text, $target, "class='$class $active'") . "\n";
$misc = (isset($lang->navGroup->$module) and $openApp != $lang->navGroup->$module) ? "data-app='$openApp'" : '';
$menuItemHtml = "<li class='$class $active' data-id='$menuItem->name'>" . html::a($link, $label, $target, $misc) . $dropMenu . "</li>\n";
if($isMobile) $menuItemHtml = html::a($link, $menuItem->text, $target, $misc . " class='$class $active'") . "\n";
echo $menuItemHtml;
}
else