* Finish task #7852.

2020-09-15 10:02:18 +08:00
parent d3b3420aa1
commit d82454cafb
6 changed files with 124 additions and 6 deletions
@@ -556,7 +556,7 @@ class commonModel extends model
        $currentMethod = $app->rawMethod;

        /* Set main menu by group. */
-        $group = isset($lang->navGroup->$moduleName) ? $lang->navGroup->$moduleName : '';
+        $group = isset($lang->navGroup->$moduleName) ? $lang->navGroup->$moduleName : $moduleName;
        self::setMainMenuByGroup($group, $moduleName, $methodName);

        /* Print all main menus. */
@@ -2157,6 +2157,10 @@ EOD;
            $lang->menu      = $lang->admin->menu;
            $lang->menuOrder = $lang->admin->menuOrder;
        }
+        if($group == 'programset')     
+        {
+            $lang->menu = $lang->programset->menu;
+        }
        if($group == 'program') $lang->menu = self::getProgramMainMenu($moduleName);
    }