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

* Finish task #61811,61812.

Browse Source
This commit is contained in:
caoyanyi
2022-07-25 09:43:53 +08:00
parent bf8a1c82d5
commit f8cd6fe1cb
10 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/mr/control.php
+2
View File
@@ -303,6 +303,8 @@ class mr extends control
$this->view->stories = $this->mr->getLinkList($MR->id, $product->id, 'story');
$this->view->bugs = $this->mr->getLinkList($MR->id, $product->id, 'bug');
$this->view->tasks = $this->mr->getLinkList($MR->id, $product->id, 'task');
$this->view->actions = $this->loadModel('action')->getList('mr', $MRID);
$this->view->users = $this->loadModel('user')->getPairs('noletter|noclosed');
$this->display();
}
module/mr/css/create.css
+1
View File
@@ -1 +1,2 @@
#mrForm table tbody th {width: 145px;}
.branch-btn {width: 110px; height: 32px; line-height: 22px; float: right;}
module/mr/lang/de.php
+1
View File
@@ -30,6 +30,7 @@ $lang->mr->mriid = "raw MR ID";
$lang->mr->title = 'Name';
$lang->mr->status = 'Status';
$lang->mr->author = 'Author';
$lang->mr->createdDate = 'Created date';
$lang->mr->assignee = 'Assignee';
$lang->mr->reviewer = 'Reviewer';
$lang->mr->mergeStatus = 'Merge status';
module/mr/lang/en.php
+1
View File
@@ -30,6 +30,7 @@ $lang->mr->mriid = "raw MR ID";
$lang->mr->title = 'Name';
$lang->mr->status = 'Status';
$lang->mr->author = 'Author';
$lang->mr->createdDate = 'Created date';
$lang->mr->assignee = 'Assignee';
$lang->mr->reviewer = 'Reviewer';
$lang->mr->mergeStatus = 'Merge status';
module/mr/lang/fr.php
+1
View File
@@ -30,6 +30,7 @@ $lang->mr->mriid = "raw MR ID";
$lang->mr->title = 'Name';
$lang->mr->status = 'Status';
$lang->mr->author = 'Author';
$lang->mr->createdDate = 'Created date';
$lang->mr->assignee = 'Assignee';
$lang->mr->reviewer = 'Reviewer';
$lang->mr->mergeStatus = 'Merge status';
module/mr/lang/vi.php
+1
View File
@@ -30,6 +30,7 @@ $lang->mr->mriid = "raw MR ID";
$lang->mr->title = 'Name';
$lang->mr->status = 'Status';
$lang->mr->author = 'Author';
$lang->mr->createdDate = 'Created date';
$lang->mr->assignee = 'Assignee';
$lang->mr->reviewer = 'Reviewer';
$lang->mr->mergeStatus = 'Merge status';
module/mr/lang/zh-cn.php
+1
View File
@@ -30,6 +30,7 @@ $lang->mr->mriid = "MR原始ID";
$lang->mr->title = '名称';
$lang->mr->status = '状态';
$lang->mr->author = '创建人';
$lang->mr->createdDate = '创建时间';
$lang->mr->assignee = '指派给';
$lang->mr->reviewer = '评审人';
$lang->mr->mergeStatus = '是否可合并';
module/mr/view/browse.html.php
+5 -3
View File
@@ -50,9 +50,10 @@
<th class='c-name'><?php common::printOrderLink('title', $orderBy, $vars, $lang->mr->title);?></th>
<th class='w-200px'><?php common::printOrderLink('sourceBranch', $orderBy, $vars, $lang->mr->sourceBranch);?></th>
<th class='w-200px'><?php common::printOrderLink('targetBranch', $orderBy, $vars, $lang->mr->targetBranch);?></th>
<th class='w-120px'><?php common::printOrderLink('mergeStatus', $orderBy, $vars, $lang->mr->mergeStatus);?></th>
<th class='w-120px'><?php common::printOrderLink('approvalStatus', $orderBy, $vars, $lang->mr->approvalStatus);?></th>
<th class='w-120px'><?php common::printOrderLink('createdBy', $orderBy, $vars, $lang->mr->author);?></th>
<th class='w-100px'><?php common::printOrderLink('mergeStatus', $orderBy, $vars, $lang->mr->mergeStatus);?></th>
<th class='w-80px'><?php common::printOrderLink('approvalStatus', $orderBy, $vars, $lang->mr->approvalStatus);?></th>
<th class='w-80px'><?php common::printOrderLink('createdBy', $orderBy, $vars, $lang->mr->author);?></th>
<th class='w-160px'><?php common::printOrderLink('createdDate', $orderBy, $vars, $lang->mr->createdDate);?></th>
<th class='c-actions-5'><?php echo $lang->actions;?></th>
</tr>
</thead>
@@ -87,6 +88,7 @@
<td><?php echo empty($MR->approvalStatus) ? $lang->mr->approvalStatusList['notReviewed'] : $lang->mr->approvalStatusList[$MR->approvalStatus];?></td>
<?php endif;?>
<td class='text' title='<?php echo zget($users, $MR->createdBy);?>'><?php echo zget($users, $MR->createdBy);?></td>
<td class='text' title='<?php echo zget($users, $MR->createdDate);?>'><?php echo zget($users, $MR->createdDate);?></td>
<td class='c-actions'>
<?php
$canDelete = ($app->user->admin or (isset($projects[$MR->hostID][$MR->sourceProject]->owner->id) and $projects[$MR->hostID][$MR->sourceProject]->owner->id == $openIDList[$MR->hostID])) ? '' : 'disabled';
module/mr/view/create.html.php
+2 -2
View File
@@ -32,7 +32,7 @@
<td>
<div class='input-group required'>
<?php echo html::select('sourceProject', array(''), '', "class='form-control chosen'");?>
<span class='input-group-addon fix-border'><?php echo $lang->mr->sourceBranch ?></span>
<span class='input-group-addon fix-border branch-btn'><?php echo $lang->mr->sourceBranch ?></span>
<?php echo html::select('sourceBranch', array(''), '', "class='form-control chosen'");?>
</div>
</td>
@@ -42,7 +42,7 @@
<td>
<div class='input-group required'>
<?php echo html::select('targetProject', array(''), '', "class='form-control chosen'");?>
<span class='input-group-addon fix-border'><?php echo $lang->mr->targetBranch ?></span>
<span class='input-group-addon fix-border branch-btn'><?php echo $lang->mr->targetBranch ?></span>
<?php echo html::select('targetBranch', array(''), '', "class='form-control chosen'");?>
</div>
</td>
module/mr/view/view.html.php
+4
View File
@@ -105,6 +105,10 @@
<div class="cell"><?php echo sprintf($lang->mr->commandDocument, $httpRepoURL, $MR->sourceBranch, $branchPath, $MR->targetBranch, $branchPath, $MR->targetBranch); ?></div>
<?php endif; ?>
<?php if($this->app->getViewType() != 'xhtml'):?>
<div class="cell"><?php include '../../common/view/action.html.php';?></div>
<?php endif;?>
<div class='main-actions'>
<div class="btn-toolbar">
<?php common::printBack(inlink('browse', '')); ?>