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

* Fix bug#16884,16856

Browse Source
This commit is contained in:
zenggang
2021-12-02 09:32:45 +00:00
parent 1c61d0c57a
commit 42a5e9bf78
5 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/gitlab/css/managegroupmembers.css
+1
View File
@@ -0,0 +1 @@
.table-form {min-width: 600px;}
module/gitlab/css/manageprojectmembers.css
+1
View File
@@ -0,0 +1 @@
.table-form {min-width: 600px;}
module/mr/control.php
+1 -2
View File
@@ -402,8 +402,7 @@ class mr extends control
$MR = $this->mr->getByID($MRID);
$result = $this->mr->close($MR);
if($result['result'] == 'fali') return $this->send($result);
die(js::locate($result['locate'], 'parent'));
return $this->send($result);
}
/**
module/mr/js/view.js
+1 -1
View File
@@ -1,6 +1,6 @@
$(document).ready(function()
{
$('#mergeButton').click(function()
$('#mergeButton,.mergeButton').click(function()
{
link = $(this).attr('href');
$.getJSON(link, function(response)
module/mr/view/view.html.php
+1 -1
View File
@@ -111,7 +111,7 @@
<?php echo html::a(inlink('approval', "mr=$MR->id&action=approve", '', true), '<i class="icon icon-ok"></i> ' . $lang->mr->approve, '', "id='mergeButton' class='btn iframe showinonlybody'"); ?>
<?php endif;?>
<?php echo html::a(inlink('approval', "mr=$MR->id&action=reject", '', true), '<i class="icon icon-bug"></i> ' . $lang->mr->reject, '', "id='mergeButton' class='btn iframe showinonlybody'" . ($MR->approvalStatus == 'rejected' ? 'disabled' : '')); ?>
<?php common::printIcon('mr', 'close', "mr=$MR->id", $MR, 'button', 'off', 'hiddenwin');?>
<?php echo html::a(inlink('close', "mr=$MR->id"), '<i class="icon icon-off"></i> ' . $lang->mr->close, '', "class='btn mergeButton'"); ?>
<?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'"); ?>