Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3

2021-03-23 15:10:12 +08:00
parent 84a4237ccc 3e8a1953be
commit 8f84823080
2 changed files with 15 additions and 6 deletions
@@ -585,8 +585,17 @@ class commonModel extends model
        if(!$openApp) return;
        $icon = zget($lang->navIcons, $openApp, '');
        
-        $nav = $lang->mainNav->$openApp;
-        list($title, $currentModule, $currentMethod, $vars) = explode('|', $nav);
+        if(!in_array($openApp, array('program', 'product', 'project')))
+        {
+            $nav = $lang->mainNav->$openApp;
+            list($title, $currentModule, $currentMethod, $vars) = explode('|', $nav);
+        }
+        else
+        {
+            $currentModule = $openApp;
+            if($openApp == 'program' or $openApp == 'project') $currentMethod = 'browse';
+            if($openApp == 'product') $currentMethod = 'all';
+        }

        $link = $openApp != 'execution' ? helper::createLink($currentModule, $currentMethod) : '';
        $html = $link ? html::a($link, "$icon {$lang->$openApp->common}", '', "class='btn'") : "$icon {$lang->$openApp->common}";