From 0417b3a1e2f88944f73a909893a75d01f86cdcc1 Mon Sep 17 00:00:00 2001
From: liyuchun <liyuchun@easycorp.ltd>
Date: Wed, 16 Mar 2022 17:24:27 +0800
Subject: [PATCH]  * Add author in mr list.

---
 module/mr/control.php          | 1 +
 module/mr/view/browse.html.php | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/module/mr/control.php b/module/mr/control.php
index 5afc835349..a24ac9d82e 100644
--- a/module/mr/control.php
+++ b/module/mr/control.php
@@ -65,6 +65,7 @@ class mr extends control
         $this->view->objectID   = $objectID;
         $this->view->orderBy    = $orderBy;
         $this->view->openIDList = $openIDList;
+        $this->view->users      = $this->loadModel('user')->getPairs('noletter');
         $this->display();
     }
 
diff --git a/module/mr/view/browse.html.php b/module/mr/view/browse.html.php
index 53a29b736d..304fc22f80 100644
--- a/module/mr/view/browse.html.php
+++ b/module/mr/view/browse.html.php
@@ -59,6 +59,7 @@
           <th class='w-200px text-left'><?php common::printOrderLink('targetBranch', $orderBy, $vars, $lang->mr->targetBranch);?></th>
           <th class='w-120px text-left'><?php common::printOrderLink('mergeStatus', $orderBy, $vars, $lang->mr->mergeStatus);?></th>
           <th class='w-120px text-left'><?php common::printOrderLink('approvalStatus', $orderBy, $vars, $lang->mr->approvalStatus);?></th>
+          <th class='w-120px text-left'><?php common::printOrderLink('createdBy', $orderBy, $vars, $lang->mr->author);?></th>
           <th class='w-120px c-actions-3'><?php echo $lang->actions;?></th>
         </tr>
       </thead>
@@ -82,6 +83,7 @@
           <?php else:?>
             <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='c-actions'>
             <?php
             $canDelete = ($app->user->admin or (isset($projects[$MR->gitlabID][$MR->sourceProject]->owner->id) and $projects[$MR->gitlabID][$MR->sourceProject]->owner->id == $openIDList[$MR->gitlabID])) ? '' : 'disabled';