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

* fix code.

Browse Source
This commit is contained in:
lichengjun
2021-06-29 14:52:49 +08:00
parent bf9d28ef7f
commit 925a7417ea
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/gitlab/model.php
-1
View File
@@ -682,7 +682,6 @@ class gitlabModel extends model
if($objectType == 'story') $issue = $this->storyToIssue($gitlabID, $projectID, $object);
if($objectType == 'task') $issue = $this->taskToIssue($gitlabID, $projectID, $object);
if($objectType == 'bug') $issue = $this->bugToIssue($gitlabID, $projectID, $object);
if($syncedIssue)
{
$this->apiUpdateIssue($gitlabID, $projectID, $syncedIssue->BID, $issue);
module/story/model.php
+2 -2
View File
@@ -830,8 +830,8 @@ class storyModel extends model
$this->dao->insert(TABLE_STORYREVIEW)->data($reviewData)->exec();
}
/* update story to gitlab issue. */
$objectID = $this->loadModel('gitlab')->getGitlabIDprojectID('story',$storyID);
if($objectID) $this->loadModel('gitlab')->pushToissue('story', $storyID, $objectID->gitlabID, $objectID->projectID);
$objectID = $this->loadModel('gitlab')->getGitlabidProjectID('story',$storyID);
if($objectID) $this->loadModel('gitlab')->pushToIssue('story', $storyID, $objectID->gitlabID, $objectID->projectID);
unset($oldStory->parent);
unset($story->parent);
module/task/model.php
+5 -1
View File
@@ -122,7 +122,7 @@ class taskModel extends model
$taskID = $this->dao->lastInsertID();
/* Sync this task to gitlab issue. */
$this->loadModel('gitlab')->pushTask($taskID, $this->post->gitlab, $this->post->gitlabProject);
$this->loadModel('gitlab')->pushToIssue('task', $taskID, $this->post->gitlab, $this->post->gitlabProject);
/* Mark design version.*/
if(isset($task->design) && !empty($task->design))
@@ -941,6 +941,10 @@ class taskModel extends model
->batchCheckIF($task->closedReason == 'cancel', 'finishedBy, finishedDate', 'empty')
->where('id')->eq((int)$taskID)->exec();
/* update story to gitlab issue. */
$objectID = $this->loadModel('gitlab')->getGitlabidProjectID('task',$taskID);
if($objectID) $this->loadModel('gitlab')->pushToIssue('task', $taskID, $objectID->gitlabID, $objectID->projectID);
if(!dao::isError())
{
/* Mark design version.*/