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

* Fix printModuleMenu.

Browse Source
This commit is contained in:
zhujinyong
2021-03-17 13:33:55 +08:00
parent 9c243491c3
commit a86598cc89
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
module/common/model.php
View File

@@ -751,19 +751,18 @@ class commonModel extends model
* Print the module menu.
*
* @param string $moduleName
* @param string $methodName
* @static
* @access public
* @return void
*/
public static function printModuleMenu($moduleName)
public static function printModuleMenu($moduleName, $methodName)
{
global $config, $lang, $app;
$moduleName = $app->rawModule;
$methodName = $app->rawMethod;
/* Set main menu by openApp. */
$openApp = $app->openApp ? $app->openApp : $lang->navGroup->$moduleName;
if(in_array($openApp, array('admin', 'repo', 'ops', 'feedback'))) return;
if(in_array($moduleName, array('admin', 'repo', 'ops', 'feedback'))) return;
if($openApp == 'my') self::getMyModuleMenu($moduleName, $methodName);
if($openApp == 'project') self::getProjectModuleMenu($moduleName, $methodName);
@@ -813,8 +812,6 @@ class commonModel extends model
/* The beginning of the menu. */
echo $isMobile ? '' : "<ul class='nav nav-default'>\n";
if(isset($lang->menugroup->$moduleName)) $moduleName = $lang->menugroup->$moduleName;
/* Cycling to print every sub menu. */
foreach($menu as $menuItem)
{

2
module/common/view/header.html.php
View File

@@ -36,7 +36,7 @@ $isQa = $app->openApp == 'qa';
<div id='subHeader'>
<div class='container'>
<div id="pageNav" class='btn-toolbar'><?php if(isset($lang->modulePageNav)) echo $lang->modulePageNav;?></div>
<nav id='subNavbar'><?php common::printModuleMenu($app->rawModule);?></nav>
<nav id='subNavbar'><?php common::printModuleMenu($app->rawModule, $app->rawMethod);?></nav>
<div id="pageActions"><div class='btn-toolbar'><?php if(isset($lang->TRActions)) echo $lang->TRActions;?></div></div>
</div>
</div>