From f8cd6fe1cbee1666db8c565c4c3146af16b64d66 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Mon, 25 Jul 2022 09:43:53 +0800
Subject: [PATCH] * Finish task #61811,61812.

---
 module/mr/control.php          | 2 ++
 module/mr/css/create.css       | 1 +
 module/mr/lang/de.php          | 1 +
 module/mr/lang/en.php          | 1 +
 module/mr/lang/fr.php          | 1 +
 module/mr/lang/vi.php          | 1 +
 module/mr/lang/zh-cn.php       | 1 +
 module/mr/view/browse.html.php | 8 +++++---
 module/mr/view/create.html.php | 4 ++--
 module/mr/view/view.html.php   | 4 ++++
 10 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/module/mr/control.php b/module/mr/control.php
index 0b0bc2ef60..7fe28b3372 100644
--- a/module/mr/control.php
+++ b/module/mr/control.php
@@ -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();
     }
diff --git a/module/mr/css/create.css b/module/mr/css/create.css
index 7176c78083..d5bc7e6536 100644
--- a/module/mr/css/create.css
+++ b/module/mr/css/create.css
@@ -1 +1,2 @@
 #mrForm table tbody th {width: 145px;}
+.branch-btn {width: 110px; height: 32px; line-height: 22px; float: right;}
diff --git a/module/mr/lang/de.php b/module/mr/lang/de.php
index 75fd977b34..c24db27c9a 100644
--- a/module/mr/lang/de.php
+++ b/module/mr/lang/de.php
@@ -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';
diff --git a/module/mr/lang/en.php b/module/mr/lang/en.php
index 75fd977b34..c24db27c9a 100644
--- a/module/mr/lang/en.php
+++ b/module/mr/lang/en.php
@@ -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';
diff --git a/module/mr/lang/fr.php b/module/mr/lang/fr.php
index 75fd977b34..c24db27c9a 100644
--- a/module/mr/lang/fr.php
+++ b/module/mr/lang/fr.php
@@ -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';
diff --git a/module/mr/lang/vi.php b/module/mr/lang/vi.php
index 75fd977b34..c24db27c9a 100644
--- a/module/mr/lang/vi.php
+++ b/module/mr/lang/vi.php
@@ -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';
diff --git a/module/mr/lang/zh-cn.php b/module/mr/lang/zh-cn.php
index 4e4ed474e4..ecefd0fda4 100644
--- a/module/mr/lang/zh-cn.php
+++ b/module/mr/lang/zh-cn.php
@@ -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 = '是否可合并';
diff --git a/module/mr/view/browse.html.php b/module/mr/view/browse.html.php
index 20d3ed910a..025b919da4 100644
--- a/module/mr/view/browse.html.php
+++ b/module/mr/view/browse.html.php
@@ -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';
diff --git a/module/mr/view/create.html.php b/module/mr/view/create.html.php
index 95d794eafb..cfe89386a6 100644
--- a/module/mr/view/create.html.php
+++ b/module/mr/view/create.html.php
@@ -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>
diff --git a/module/mr/view/view.html.php b/module/mr/view/view.html.php
index 190a484577..83323b76c2 100644
--- a/module/mr/view/view.html.php
+++ b/module/mr/view/view.html.php
@@ -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', '')); ?>