diff --git a/module/project/model.php b/module/project/model.php index 448cf3aef6..067c5df78a 100755 --- a/module/project/model.php +++ b/module/project/model.php @@ -2913,21 +2913,21 @@ class projectModel extends model if($project->status == 'wait' || $project->status == 'suspended') $item->actions[] = 'start'; - $closePriv = common::hasPriv($moduleName, 'close'); + $canClose = common::hasPriv($moduleName, 'close'); if($project->status == 'doing') { $item->actions[] = 'close'; - $closePriv = false; + $canClose = false; } - $activatePriv = common::hasPriv($moduleName, 'activate'); + $canActivate = common::hasPriv($moduleName, 'activate'); if($project->status == 'closed') { $item->actions[] = 'active'; - $activatePriv = false; + $canActivate = false; } - if(common::hasPriv($moduleName, 'suspend') || $closePriv || $activatePriv) + if(common::hasPriv($moduleName, 'suspend') || $canClose || $canActivate) { $menu = 'pause'; if($project->status != 'doing') $menu .= ',close'; @@ -2973,19 +2973,21 @@ class projectModel extends model $menu .= $this->buildMenu($moduleName, 'start', $params, $project, 'browse', 'play', '', 'iframe', true); } - $closePriv = common::hasPriv($moduleName, 'close'); + $canClose = common::hasPriv($moduleName, 'close'); if($project->status == 'doing') { - $menu .= $this->buildMenu($moduleName, 'close', $params, $project, 'browse', 'off', '', 'iframe', true); + $menu .= $this->buildMenu($moduleName, 'close', $params, $project, 'browse', 'off', '', 'iframe', true); + $canClose = false; } - $activatePriv = common::hasPriv($moduleName, 'activate'); + $canActivate = common::hasPriv($moduleName, 'activate'); if($project->status == 'closed') { - $menu .= $this->buildMenu($moduleName, 'activate', $params, $project, 'browse', 'magic', '', 'iframe', true); + $menu .= $this->buildMenu($moduleName, 'activate', $params, $project, 'browse', 'magic', '', 'iframe', true); + $canActivate = false; } - if(common::hasPriv($moduleName, 'suspend') || $closePriv || $activatePriv) + if(common::hasPriv($moduleName, 'suspend') || $canClose || $canActivate) { $menu .= "
"; $menu .= "";