diff --git a/module/common/view/footer.html.php b/module/common/view/footer.html.php index 9e7afaf01a..6a5ea6bf22 100755 --- a/module/common/view/footer.html.php +++ b/module/common/view/footer.html.php @@ -9,9 +9,6 @@ $.initSidebar();
vision != 'lite') echo $this->loadModel('score')->getNotice(); ?>
+ diff --git a/module/project/model.php b/module/project/model.php index b05cb62802..867448ffd8 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -2486,7 +2486,12 @@ class projectModel extends model */ public function setNoSprintMenu($objectID) { - $this->config->executionNavGroup = 'execution'; + $moduleName = $this->app->rawModule; + $methodName = $this->app->rawMethod; + + $navGroup = zget($this->lang->navGroup, $moduleName); + $this->config->resetNavGroup['execution'] = 'execution'; + $this->config->resetNavGroup[$moduleName] = $navGroup; $project = $this->dao->select('*')->from(TABLE_PROJECT)->where('id')->eq($objectID)->andWhere('noSprint')->eq(1)->fetch(); if(empty($project)) return; @@ -2514,11 +2519,6 @@ class projectModel extends model } if(empty($projectID) or empty($executionID)) return; - $moduleName = $this->app->rawModule; - $methodName = $this->app->rawMethod; - - $navGroup = zget($this->lang->navGroup, $moduleName); - $this->app->tab = 'project'; $_COOKIE['tab'] = 'project'; @@ -2552,7 +2552,7 @@ class projectModel extends model } } - $this->config->executionNavGroup = 'project'; + $this->config->resetNavGroup[$moduleName] = 'project'; /* If objectID is set, cannot use homeMenu. */ unset($this->lang->$navGroup->homeMenu);