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

2021-03-17 13:15:49 +08:00
parent 62843dd5a0 9c243491c3
commit b95a5ccdf0
71 changed files with 408 additions and 598 deletions
@@ -143,7 +143,11 @@ class testtaskModel extends model
            common::setMenuVars($this->lang->testtask->menu, $key, $replace);
        }

-        $this->lang->testtask->menu->testcase['subModule'] = 'testtask';
+        if($this->lang->navGroup->testcase == 'project' && $this->app->rawMethod == 'browseunits')
+        {
+            $lang->projectQa->menu->testcase['subModule'] = 'testtask';
+        }
+
        if($this->lang->navGroup->testtask == 'qa')
        {
            foreach($this->lang->qa->subMenu->testcase as $key => $menu)