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

* Fix Replace with getRationByObject.

Browse Source
This commit is contained in:
lichengjun
2021-07-01 18:34:24 +08:00
parent 7c240783af
commit cebe56a593
4 changed files with 42 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/model.php
+12 -11
View File
@@ -647,7 +647,7 @@ class bugModel extends model
if(!empty($bug->resolvedBy)) $this->loadModel('score')->create('bug', 'resolve', $bugID);
$this->file->updateObjectID($this->post->uid, $bugID, 'bug');
$relation = $this->loadModel('gitlab')->getRelationByObject('bug',$bugID);
$relation = $this->loadModel('gitlab')->getRelationByObject('bug', $bugID);
if($relation) $this->loadModel('gitlab')->pushToIssue('bug', $bugID, $relation->gitlabID, $relation->projectID);
return common::createChanges($oldBug, $bug);
@@ -1183,7 +1183,7 @@ class bugModel extends model
$this->dao->update(TABLE_BUG)->data($bug)->autoCheck()->where('id')->eq((int)$bugID)->exec();
$this->dao->update(TABLE_BUG)->set('activatedCount = activatedCount + 1')->where('id')->eq((int)$bugID)->exec();
$relation = $this->loadModel('gitlab')->getGitlabIDprojectID('bug',$bugID);
$relation = $this->loadModel('gitlab')->getRelationByObject('bug',$bugID);
if($relation) $this->loadModel('gitlab')->pushToIssue('bug', $bugID, $relation->gitlabID, $relation->projectID);
$openedBuilds = $this->post->openedBuild;
@@ -1226,19 +1226,20 @@ class bugModel extends model
->remove('comment')
->get();
$relation = $this->loadModel('gitlab')->getRelationByObject('bug', $bugID);
$this->dao->update(TABLE_BUG)->data($bug)->autoCheck()->where('id')->eq((int)$bugID)->exec();
$singleIssue = new stdclass();
$singleIssue = $this->loadModel('gitlab')->apiGetSingleIssue($relation->gitlabID, $relation->issueID);
$relation = $this->loadModel('gitlab')->getRelationByObject('bug', $bugID);
if(!empty($relation))
{
$singleIssue = new stdclass();
$singleIssue = $this->loadModel('gitlab')->apiGetSingleIssue($relation->gitlabID, $relation->issueID);
if($singleIssue->state != 'closed')
{
$objectID = $this->loadModel('gitlab')->getGitlabIDprojectID('bug',$bugID);
if($objectID) $this->loadModel('gitlab')->pushToIssue('bug', $bugID, $objectID->gitlabID, $objectID->projectID);
if($singleIssue->state != 'closed')
{
$objectID = $this->loadModel('gitlab')->getRelationByObject('bug',$bugID);
if($objectID) $this->loadModel('gitlab')->pushToIssue('bug', $bugID, $objectID->gitlabID, $objectID->projectID);
}
}
return common::createChanges($oldBug, $bug);
}
module/gitlab/model.php
+2 -2
View File
@@ -829,9 +829,9 @@ class gitlabModel extends model
$projectID = $result->projectID;
}
$syncedIssue = $this->getSyncedIssue($objectType = $objectType, $objectID = $objectID, $gitlabID);
$syncedIssue = $this->getRelationByObject($objectType, $objectID);
$issue = $this->parseObjectToIssue($gitlabID, $projectID, $object, $objectType);
if($syncedIssue) return $this->apiUpdateIssue($gitlabID, $projectID, $syncedIssue->BID, $issue);
if($syncedIssue) return $this->apiUpdateIssue($gitlabID, $projectID, $syncedIssue->issueID, $issue);
$label = $this->createZentaoObjectLabel($gitlabID, $projectID, $objectType, $objectID);
$issue->labels = $label->name;
module/story/model.php
+14 -3
View File
@@ -830,7 +830,7 @@ class storyModel extends model
$this->dao->insert(TABLE_STORYREVIEW)->data($reviewData)->exec();
}
/* update story to gitlab issue. */
$objectID = $this->loadModel('gitlab')->getGitlabidProjectID('story',$storyID);
$objectID = $this->loadModel('gitlab')->getRelationByObject('story',$storyID);
if($objectID) $this->loadModel('gitlab')->pushToIssue('story', $storyID, $objectID->gitlabID, $objectID->projectID);
unset($oldStory->parent);
@@ -1426,8 +1426,19 @@ 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);
$relation = $this->loadModel('gitlab')->getRelationByObject('story', $storyID);
if(!empty($relation))
{
$singleIssue = new stdclass();
$singleIssue = $this->loadModel('gitlab')->apiGetSingleIssue($relation->gitlabID, $relation->issueID);
if($singleIssue->state != 'closed')
{
$objectID = $this->loadModel('gitlab')->getRelationByObject('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);
module/task/model.php
+14 -3
View File
@@ -942,7 +942,7 @@ class taskModel extends model
->where('id')->eq((int)$taskID)->exec();
/* update story to gitlab issue. */
$objectID = $this->loadModel('gitlab')->getGitlabidProjectID('task',$taskID);
$objectID = $this->loadModel('gitlab')->getRelationByObject('task',$taskID);
if($objectID) $this->loadModel('gitlab')->pushToIssue('task', $taskID, $objectID->gitlabID, $objectID->projectID);
if(!dao::isError())
@@ -1733,8 +1733,19 @@ 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);
$relation = $this->loadModel('gitlab')->getRelationByObject('task', $taskID);
if(!empty($relation))
{
$singleIssue = new stdclass();
$singleIssue = $this->loadModel('gitlab')->apiGetSingleIssue($relation->gitlabID, $relation->issueID);
if($singleIssue->state != 'closed')
{
$objectID = $this->loadModel('gitlab')->getRelationByObject('task',$taskID);
if($objectID) $this->loadModel('gitlab')->pushToIssue('task', $taskID, $objectID->gitlabID, $objectID->projectID);
}
}
if(!dao::isError())
{