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

* Remove duplicated loadModel for gitlab related after CR.

Browse Source
This commit is contained in:
dingguodong
2021-07-15 13:53:04 +08:00
parent 4c58d0bbe4
commit bb7f7cf142
8 changed files with 130 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/control.php
+8 -5
View File
@@ -217,8 +217,9 @@ class task extends control
foreach(explode(',', $this->config->task->customCreateFields) as $field) $customFields[$field] = $this->lang->task->$field;
if($execution->type == 'ops') unset($customFields['story']);
$allGitlabs = $this->loadModel('gitlab')->getPairs();
$gitlabProjects = $this->loadModel('gitlab')->getProjectsByExecution($executionID);
$this->loadModel('gitlab');
$allGitlabs = $this->gitlab->getPairs();
$gitlabProjects = $this->gitlab->getProjectsByExecution($executionID);
foreach($allGitlabs as $id => $name) if($id and !isset($gitlabProjects[$id])) unset($allGitlabs[$id]);
$this->view->gitlabList = $allGitlabs;
$this->view->gitlabProjects = $gitlabProjects;
@@ -577,7 +578,8 @@ class task extends control
$task = $this->task->getByID($taskID);
$relation = $this->loadModel('gitlab')->getRelationByObject('task', $taskID);
$this->loadModel('gitlab');
$relation = $this->gitlab->getRelationByObject('task', $taskID);
if($relation)$this->gitlab->apiUpdateIssue($relation->gitlabID, $relation->projectID, $relation->issueID, 'task', $task, $taskID);
$members = $this->loadModel('user')->getTeamMemberPairs($executionID, 'execution', 'nodeleted');
@@ -1298,8 +1300,9 @@ class task extends control
else
{
/* Delete related issue in gitlab. */
$relation = $this->loadModel('gitlab')->getRelationByObject('task', $taskID);
if(!empty($relation)) $this->loadModel('gitlab')->deleteIssue('task', $taskID, $relation->issueID);
$this->loadModel('gitlab');
$relation = $this->gitlab->getRelationByObject('task', $taskID);
if(!empty($relation)) $this->gitlab->deleteIssue('task', $taskID, $relation->issueID);
$this->task->delete(TABLE_TASK, $taskID);
if($task->parent > 0)