Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* adjust for no sprint menu.

Browse Source
This commit is contained in:
wangyidong
2022-09-22 09:42:01 +08:00
parent 0165845882
commit 64bb6eb19f
4 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+1 -1
View File
@@ -139,7 +139,7 @@ class execution extends control
$recentExecutions = array_unique($recentExecutions);
$recentExecutions = array_slice($recentExecutions, 0, 5);
$recentExecutions = join(',', $recentExecutions);
if(empty($this->config->projectMode))
if($this->session->noSprint)
{
if(!isset($this->config->execution->recentExecutions) or $this->config->execution->recentExecutions != $recentExecutions) $this->setting->updateItem($this->app->user->account . 'common.execution.recentExecutions', $recentExecutions);
if(!isset($this->config->execution->lastExecution) or $this->config->execution->lastExecution != $executionID) $this->setting->updateItem($this->app->user->account . 'common.execution.lastExecution', $executionID);
module/execution/model.php
+1
View File
@@ -1269,6 +1269,7 @@ class executionModel extends model
$executions = $this->dao->select('*, IF(INSTR("done,closed", status) < 2, 0, 1) AS isDone, INSTR("doing,wait,suspended,closed", status) AS sortStatus')->from(TABLE_EXECUTION)
->where('deleted')->eq(0)
->andWhere('vision')->eq($this->config->vision)
->beginIF($this->session->noSprint and $this->app->tab == 'execution')->andWhere('noSprint')->eq('0')->fi()
->beginIF($type == 'all')->andWhere('type')->in('stage,sprint,kanban')->fi()
->beginIF($projectID)->andWhere('project')->eq($projectID)->fi()
->beginIF($type != 'all')->andWhere('type')->eq($type)->fi()
module/project/model.php
+8 -2
View File
@@ -2491,10 +2491,14 @@ class projectModel extends model
$moduleName = $this->app->rawModule;
$methodName = $this->app->rawMethod;
$this->session->set('noSprint', false);
$navGroup = zget($this->lang->navGroup, $moduleName);
$this->config->resetNavGroup['execution'] = 'execution';
$this->config->resetNavGroup['task'] = zget($this->lang->navGroup, 'task');
$this->config->resetNavGroup['story'] = zget($this->lang->navGroup, 'story');
$this->config->resetNavGroup[$moduleName] = $navGroup;
$this->session->set('noSprint', false, 'project');
$project = $this->dao->select('*')->from(TABLE_PROJECT)->where('id')->eq($objectID)->andWhere('noSprint')->eq('1')->fetch();
if(empty($project)) return;
@@ -2519,7 +2523,7 @@ class projectModel extends model
if(empty($projectID) or empty($executionID)) return;
$this->session->set('project', $projectID, 'project');
$this->session->set('noSprint', true, 'project');
$this->session->set('noSprint', true);
$this->app->tab = 'project';
$_COOKIE['tab'] = 'project';
@@ -2555,6 +2559,8 @@ class projectModel extends model
}
$this->config->resetNavGroup['execution'] = 'project';
$this->config->resetNavGroup['task'] = 'project';
$this->config->resetNavGroup['story'] = 'project';
$this->config->resetNavGroup[$moduleName] = 'project';
/* If objectID is set, cannot use homeMenu. */
module/story/control.php
+1 -1
View File
@@ -64,7 +64,7 @@ class story extends control
{
$this->product->setMenu($productID);
}
else if($this->app->tab == 'project')
elseif($this->app->tab == 'project')
{
$objects = $this->project->getPairsByProgram();