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

Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu

Browse Source
This commit is contained in:
dingguodong
2021-07-01 16:22:45 +08:00
parent 75e6079c46 65e1feff0d
commit 568e59f167
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/model.php
+1 -1
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')->getGitlabIDprojectID('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);
module/gitlab/model.php
+3 -4
View File
@@ -506,8 +506,7 @@ class gitlabModel extends model
*/
public function apiGetSingleIssue($gitlabID, $projectID, $issueID)
{
$apiRoot = $this->getApiRoot($gitlabID);
$url = sprintf($apiRoot, "/issues/{$issueID}");
$url = sprintf($this->getApiRoot($gitlabID), "/issues/{$issueID}");
return json_decode(commonModel::http($url));
}
@@ -825,7 +824,7 @@ class gitlabModel extends model
if(empty($object)) return false;
if(!$gitlabID or !$projectID)
{
$result = $this->getGitlabIDprojectID($objectType, $objectID);
$result = $this->getRelationByObject($objectType, $objectID);
$gitlabID = $result->gitlabID;
$projectID = $result->projectID;
}
@@ -858,7 +857,7 @@ class gitlabModel extends model
public function deleteIssue($gitlabID, $projectID, $objectType, $objectID, $issueID)
{
$object = $this->loadModel($objectType)->getByID($objectID);
$relationID = $this->getRelationID($objectType, $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);
}
module/task/model.php
+1 -1
View File
@@ -1674,7 +1674,7 @@ class taskModel extends model
->where('id')->eq((int)$taskID)
->exec();
$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($oldTask->parent > 0) $this->updateParentStatus($taskID);