diff --git a/module/common/model.php b/module/common/model.php index 1ca177975d..9d2afaf375 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -2621,7 +2621,6 @@ EOD; if($program->auth == 'extend') $this->app->user->rights['rights'] = array_merge_recursive($programRightGroup, $rights); if($program->auth == 'reset') { - if(!$program->multiple) $this->config->project->includedPriv = $this->config->project->noSprintPriv; /* If priv way is reset, unset common program priv, and cover by program priv. */ $projectPrivs = $this->loadModel('project')->processProjectPrivs($program->multiple ? $program->model : 'noSprint'); foreach($projectPrivs as $module => $methods) diff --git a/module/project/control.php b/module/project/control.php index 53b3c53a92..5b11495ee9 100755 --- a/module/project/control.php +++ b/module/project/control.php @@ -1560,7 +1560,6 @@ class project extends control } if($project->model == 'scrum') unset($this->lang->resource->projectstory->track); - if(!$project->multiple) $this->config->project->includedPriv = $this->config->project->noSprintPriv; if(!$project->multiple and !$project->hasProduct) { unset($this->lang->resource->story->batchChangePlan); diff --git a/module/project/model.php b/module/project/model.php index 1518f6563a..99f0c49f87 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -937,12 +937,14 @@ class projectModel extends model /** * Process the project privs according to the project model. * - * @param string $model sprint | waterfall + * @param string $model sprint | waterfall | noSprint * @access public * @return object */ public function processProjectPrivs($model = 'waterfall') { + if($model == 'noSprint') $this->config->project->includedPriv = $this->config->project->noSprintPriv; + $this->app->loadLang('group'); $privs = new stdclass();