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

* Simplify function for deleteIssue.

Browse Source
This commit is contained in:
dingguodong
2021-07-01 16:33:13 +08:00
parent 568e59f167
commit 1a5824ea8b
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/control.php
+1 -1
View File
@@ -1553,7 +1553,7 @@ class bug extends control
{
/* Delete related issue in gitlab. */
$relation = $this->loadModel('gitlab')->getRelationByObject('bug', $bugID);
if(!empty($relation)) $this->loadModel('gitlab')->deleteIssue($relation->gitlabID, $relation->projectID, 'bug', $bugID, $relation->issueID);
if(!empty($relation)) $this->loadModel('gitlab')->deleteIssue('bug', $bugID, $relation->issueID);
$this->bug->delete(TABLE_BUG, $bugID);
if($bug->toTask != 0)
module/gitlab/model.php
+5 -5
View File
@@ -854,12 +854,12 @@ class gitlabModel extends model
* @access public
* @return void
*/
public function deleteIssue($gitlabID, $projectID, $objectType, $objectID, $issueID)
public function deleteIssue($objectType, $objectID, $issueID)
{
$object = $this->loadModel($objectType)->getByID($objectID);
$relationID = $this->getRelationByObject($objectType, $objectID);
if(!empty($relationID)) $this->dao->delete()->from(TABLE_RELATION)->where('id')->eq($relationID)->exec();
$this->apiDeleteIssue($gitlabID, $projectID, $issueID);
$object = $this->loadModel($objectType)->getByID($objectID);
$relation = $this->getRelationByObject($objectType, $objectID);
if(!empty($relation)) $this->dao->delete()->from(TABLE_RELATION)->where('id')->eq($relation->id)->exec();
$this->apiDeleteIssue($relation->gitlabID, $relation->projectID, $issueID);
}
/**
module/story/control.php
+1 -1
View File
@@ -989,7 +989,7 @@ class story extends control
{
/* Delete related issue in gitlab. */
$relation = $this->loadModel('gitlab')->getRelationByObject('story', $storyID);
$this->loadModel('gitlab')->deleteIssue($relation->gitlabID, $relation->projectID, 'story', $storyID, $relation->issueID);
if(!empty($relation)) $this->loadModel('gitlab')->deleteIssue('story', $storyID, $relation->issueID);
$this->story->delete(TABLE_STORY, $storyID);
if($story->parent > 0)
module/task/control.php
+1 -1
View File
@@ -1282,7 +1282,7 @@ class task extends control
{
/* Delete related issue in gitlab. */
$relation = $this->loadModel('gitlab')->getRelationByObject('task', $taskID);
$this->loadModel('gitlab')->deleteIssue($relation->gitlabID, $relation->projectID, 'task', $taskID, $relation->issueID);
if(!empty($relation)) $this->loadModel('gitlab')->deleteIssue('task', $taskID, $relation->issueID);
$this->task->delete(TABLE_TASK, $taskID);
if($task->parent > 0)