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

* [bug#51540] adjust mr operate btn check logic.

Browse Source
This commit is contained in:
caoyanyi
2024-06-21 14:48:41 +08:00
committed by 李阳
parent d848bd2812
commit e3612f8fb6
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/mr/ui/actions.html.php
+2 -1
View File
@@ -12,6 +12,7 @@ namespace zin;
$hasNoChange = $MR->synced && empty($rawMR->changes_count) ? true : false;
$hasConflict = $MR->synced === '1' ? $rawMR->has_conflicts : !$MR->hasNoConflict;
$mergeStatus = !empty($rawMR->merge_status) ? $rawMR->merge_status : $MR->mergeStatus;
$compileNotSuccess = !empty($compile->id) && $compile->status != 'success';
$mainActions = array();
@@ -47,7 +48,7 @@ foreach($config->mr->view->operateList as $operate)
if($operate == 'approval')
{
if($hasNoChange || $hasConflict || $compileNotSuccess || $MR->approvalStatus == 'approved')
if($hasNoChange || $hasConflict || $compileNotSuccess || $MR->approvalStatus == 'approved' || $mergeStatus == 'cannot_be_merged')
{
$action['disabled'] = true;
if($compileNotSuccess) $action['hint'] = $lang->mr->compileTip;