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

* Close and Reopen MR.

Browse Source
This commit is contained in:
dingguodong
2021-11-08 15:33:39 +08:00
parent 1e931339ef
commit 53d263c3c6
5 changed files with 74 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/mr/lang/en.php
+1
View File
@@ -29,6 +29,7 @@ $lang->mr->approval = 'Approval';
$lang->mr->approve = 'Approve';
$lang->mr->reject = 'Reject';
$lang->mr->close = 'Close';
$lang->mr->reopen = 'Reopen';
$lang->mr->approvalResult = 'Approval result';
$lang->mr->approvalResultList = array();
module/mr/lang/zh-cn.php
+1
View File
@@ -29,6 +29,7 @@ $lang->mr->approval = '评审';
$lang->mr->approve = '通过';
$lang->mr->reject = '拒绝';
$lang->mr->close = '关闭';
$lang->mr->reopen = '重新打开';
$lang->mr->approvalResult = '评审意见';
$lang->mr->approvalResultList = array();
module/mr/lang/zh-tw.php
+1
View File
@@ -29,6 +29,7 @@ $lang->mr->approval = '評審';
$lang->mr->approve = '通過';
$lang->mr->reject = '拒絕';
$lang->mr->close = '關閉';
$lang->mr->reopen = '重新打開';
$lang->mr->approvalResult = '評審意見';
$lang->mr->approvalResultList = array();
module/mr/model.php
+68
View File
@@ -445,6 +445,38 @@ class mrModel extends model
return json_decode(commonModel::http($url, null, array(CURLOPT_CUSTOMREQUEST => 'DELETE')));
}
/**
* Close MR by API.
*
* @docs https://docs.gitlab.com/ee/api/merge_requests.html#update-mr
* @param int $gitlabID
* @param int $projectID
* @param int $MRID
* @access public
* @return object
*/
public function apiCloseMR($gitlabID, $projectID, $MRID)
{
$url = sprintf($this->gitlab->getApiRoot($gitlabID), "/projects/$projectID/merge_requests/$MRID") . '&state_event=close';
return json_decode(commonModel::http($url, null, array(CURLOPT_CUSTOMREQUEST => 'PUT')));
}
/**
* Reopen MR by API.
*
* @docs https://docs.gitlab.com/ee/api/merge_requests.html#update-mr
* @param int $gitlabID
* @param int $projectID
* @param int $MRID
* @access public
* @return object
*/
public function apiReopenMR($gitlabID, $projectID, $MRID)
{
$url = sprintf($this->gitlab->getApiRoot($gitlabID), "/projects/$projectID/merge_requests/$MRID") . '&state_event=reopen';
return json_decode(commonModel::http($url, null, array(CURLOPT_CUSTOMREQUEST => 'PUT')));
}
/**
* Accept MR by API.
*
@@ -653,4 +685,40 @@ class mrModel extends model
}
return array('result' => 'fail', 'message' => $this->lang->mr->repeatedOperation, 'locate' => helper::createLink('mr', 'view', "mr={$MR->id}"));
}
/**
* Close this MR.
*
* @param mixed $MR
* @return void
*/
public function close($MR)
{
$this->loadModel('action');
$actionID = $this->action->create('mr', $MR->id, 'close');
$rawMR = $this->apiCloseMR($MR->gitlabID, $MR->targetProject, $MR->mriid);
$changes = common::createChanges($MR, $rawMR);
$this->action->logHistory($actionID, $changes);
if(isset($rawMR->state) and $rawMR->state == 'closed') return array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => helper::createLink('mr', 'view', "mr={$MR->id}"));
return array('result' => 'fail', 'message' => $this->lang->fail, 'locate' => helper::createLink('mr', 'view', "mr={$MR->id}"));
}
/**
* Reopen this MR.
*
* @param mixed $MR
* @return void
*/
public function reopen($MR)
{
$this->loadModel('action');
$actionID = $this->action->create('mr', $MR->id, 'reopen');
$rawMR = $this->apiReopenMR($MR->gitlabID, $MR->targetProject, $MR->mriid);
$changes = common::createChanges($MR, $rawMR);
$this->action->logHistory($actionID, $changes);
if(isset($rawMR->state) and $rawMR->state == 'opened') return array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => helper::createLink('mr', 'view', "mr={$MR->id}"));
return array('result' => 'fail', 'message' => $this->lang->fail, 'locate' => helper::createLink('mr', 'view', "mr={$MR->id}"));
}
}
module/mr/view/view.html.php
+3 -2
View File
@@ -48,13 +48,14 @@
<div class='main-actions'>
<div class="btn-toolbar">
<?php common::printBack(inlink('browse', '')); ?>
<?php if ($rawMR->state == 'opened' and !$rawMR->has_conflicts) : ?>
<?php echo html::a(inlink('accept', "mr=$MR->id"), '<i class="icon icon-flow"></i> ' . $lang->mr->acceptMR, '', "id='mergeButton' class='btn'"); ?>
<?php if ($rawMR->state == 'opened' and !$rawMR->has_conflicts) echo html::a(inlink('accept', "mr=$MR->id"), '<i class="icon icon-flow"></i> ' . $lang->mr->acceptMR, '', "id='mergeButton' class='btn'"); ?>
<?php if ($rawMR->state == 'opened'): ?>
<?php echo html::a(inlink('approval', "mr=$MR->id&action=approve&onlybody=yes"), '<i class="icon icon-ok"></i> ' . $lang->mr->approve, '', "id='mergeButton' class='btn'"); ?>
<?php echo html::a(inlink('approval', "mr=$MR->id&action=reject&onlybody=yes"), '<i class="icon icon-bug"></i> ' . $lang->mr->reject, '', "id='mergeButton' class='btn'"); ?>
<?php echo html::a(inlink('close', "mr=$MR->id"), '<i class="icon icon-close"></i> ' . $lang->mr->close, '', "id='mergeButton' class='btn'"); ?>
<?php echo html::a(inlink('edit', "mr=$MR->id"), '<i class="icon icon-edit"></i> ' . str_replace($lang->mr->common, '', $lang->mr->edit), '', "id='mergeButton' class='btn'"); ?>
<?php endif; ?>
<?php if ($rawMR->state == 'closed') echo html::a(inlink('reopen', "mr=$MR->id"), '<i class="icon icon-restart"></i> ' . $lang->mr->reopen, '', "id='mergeButton' class='btn'"); ?>
<?php echo html::a(inlink('delete', "mr=$MR->id"), '<i class="icon icon-trash"></i> ' . str_replace($lang->mr->common, '', $lang->mr->delete), '', "id='mergeButton' class='btn'"); ?>
</div>
</div>