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

* Add bug,story,task push to issues function.

Browse Source
This commit is contained in:
lichengjun
2021-06-29 10:43:30 +08:00
parent 2e9351bad6
commit df508bdfec
3 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/model.php
+3
View File
@@ -1219,6 +1219,9 @@ class bugModel extends model
$this->dao->update(TABLE_BUG)->data($bug)->autoCheck()->where('id')->eq((int)$bugID)->exec();
$objectID = $this->loadModel('gitlab')->getGitlabIDprojectID('bug',$bugID);
if($objectID) $this->loadModel('bug')->pushToissue('bug', $bugID, $objectID->gitlabID, $objectID->projectID);
return common::createChanges($oldBug, $bug);
}
module/story/model.php
+6 -3
View File
@@ -831,7 +831,7 @@ class storyModel extends model
}
/* update story to gitlab issue. */
$objectID = $this->loadModel('gitlab')->getGitlabIDprojectID('story',$storyID);
if($objectID) $this->loadModel('gitlab')->pushToissue('story', $storyID, $this->post->gitlab, $this->post->gitlabProject);
if($objectID) $this->loadModel('gitlab')->pushToissue('story', $storyID, $objectID->gitlabID, $objectID->projectID);
unset($oldStory->parent);
unset($story->parent);
@@ -1426,6 +1426,9 @@ class storyModel extends model
->checkIF($story->closedReason == 'duplicate', 'duplicateStory', 'notempty')
->where('id')->eq($storyID)->exec();
$objectID = $this->loadModel('gitlab')->getGitlabIDprojectID('story',$storyID);
if($objectID) $this->loadModel('gitlab')->pushToissue('story', $storyID, $objectID->gitlabID, $objectID->projectID);
/* Update parent story status. */
if($oldStory->parent > 0) $this->updateParentStatus($storyID, $oldStory->parent);
$this->setStage($storyID);
@@ -1769,9 +1772,9 @@ class storyModel extends model
if(!dao::isError())
{
/* Update this story to gitlab issue. */
/* Update story to gitlab issue. */
$objectID = $this->loadModel('gitlab')->getGitlabIDprojectID('story',$storyID);
if($objectID) $this->loadModel('gitlab')->pushToissue('story', $storyID, $this->post->gitlab, $this->post->gitlabProject);
if($objectID) $this->loadModel('gitlab')->pushToissue('story', $storyID, $objectID->gitlabID, $objectID->projectID);
return common::createChanges($oldStory, $story);
}
module/task/model.php
+10
View File
@@ -1670,6 +1670,9 @@ class taskModel extends model
->where('id')->eq((int)$taskID)
->exec();
$objectID = $this->loadModel('gitlab')->getGitlabIDprojectID('task',$taskID);
if($objectID) $this->loadModel('gitlab')->pushToissue('task', $taskID, $objectID->gitlabID, $objectID->projectID);
if($oldTask->parent > 0) $this->updateParentStatus($taskID);
if($oldTask->story) $this->loadModel('story')->setStage($oldTask->story);
if($task->status == 'done' && !dao::isError()) $this->loadModel('score')->create('task', 'finish', $taskID);
@@ -1726,6 +1729,9 @@ class taskModel extends model
$this->dao->update(TABLE_TASK)->data($task)->autoCheck()->where('id')->eq((int)$taskID)->exec();
$objectID = $this->loadModel('gitlab')->getGitlabIDprojectID('task',$taskID);
if($objectID) $this->loadModel('gitlab')->pushToissue('task', $taskID, $objectID->gitlabID, $objectID->projectID);
if(!dao::isError())
{
if($oldTask->parent > 0) $this->updateParentStatus($taskID);
@@ -1769,6 +1775,10 @@ class taskModel extends model
$this->dao->update(TABLE_TASK)->set('assignedTo=openedBy')->where('parent')->eq((int)$taskID)->exec();
}
if($oldTask->story) $this->loadModel('story')->setStage($oldTask->story);
$objectID = $this->loadModel('gitlab')->getGitlabIDprojectID('task',$taskID);
if($objectID) $this->loadModel('gitlab')->pushToissue('task', $taskID, $objectID->gitlabID, $objectID->projectID);
if(!dao::isError()) return common::createChanges($oldTask, $task);
}