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

Merge branch '18.x' into 18.8.1

Browse Source
This commit is contained in:
tanghucheng
2023-10-17 03:45:57 -04:00
parent 02080b8bcb 517418441c
commit 558517a538
504 changed files with 5640 additions and 4276 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/control.php
+7 -1
View File
@@ -1096,6 +1096,11 @@ class project extends control
$this->project->setMenu($projectID);
if(!$projectID) return print(js::locate($this->createLink('project', 'browse')));
if(!$project->multiple)
{
$executionID = $this->execution->getNoMultipleID($projectID);
return print(js::locate($this->createLink('execution', 'task', "executionID=$executionID")));
}
if(!empty($project->model) and $project->model == 'kanban' and !(defined('RUN_MODE') and RUN_MODE == 'api')) return print(js::locate($this->createLink('project', 'index', "projectID=$projectID")));
/* Load pager and get tasks. */
@@ -2362,7 +2367,8 @@ class project extends control
if($projectID)
{
$project = $this->project->getById($projectID);
$executions = array('' => '') + $this->loadModel('execution')->getPairs($projectID, $type, $mode);
$executions = $this->loadModel('execution')->getPairs($projectID, $type, $mode);
$executions = array('' => '') + $this->execution->resetExecutionSorts($executions, array(), array(), $projectID);
$disabled = !empty($project->multiple) ? '' : 'disabled';
}