From 2da0b392c2225605cdc9ff89f1e573cd2bc9689e Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie0123@163.com>
Date: Mon, 7 Sep 2020 09:31:30 +0800
Subject: [PATCH] * Finish task #7830.  # Please enter the commit message for
 your changes. Lines starting

---
 module/design/control.php              | 2 ++
 module/design/view/linkcommit.html.php | 2 +-
 module/design/view/viewcommit.html.php | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/module/design/control.php b/module/design/control.php
index e4f4bfcdac..9035052df7 100644
--- a/module/design/control.php
+++ b/module/design/control.php
@@ -267,6 +267,7 @@ class design extends control
         $this->view->end        = $end;
         $this->view->design     = $this->design->getByID($designID);
         $this->view->pager      = $pager;
+        $this->view->users      = $this->loadModel('user')->getPairs('noletter');
 
         $this->display();
     }
@@ -315,6 +316,7 @@ class design extends control
 
         $this->view->design = $this->design->getCommit($designID, $pager);
         $this->view->pager  = $pager;
+        $this->view->users  = $this->loadModel('user')->getPairs('noletter');
 
         $this->display();
     }
diff --git a/module/design/view/linkcommit.html.php b/module/design/view/linkcommit.html.php
index e238a92916..c318513078 100644
--- a/module/design/view/linkcommit.html.php
+++ b/module/design/view/linkcommit.html.php
@@ -66,7 +66,7 @@
           <td><?php echo $log->commit?></td>
           <?php endif;?>
           <td><?php echo substr($log->time, 0, 10);?></td>
-          <td><?php echo $log->committer;?></td>
+          <td><?php echo zget($users, $log->committer, $log->committer);?></td>
           <?php $comment = htmlspecialchars($log->comment, ENT_QUOTES);?>
           <td title='<?php echo $comment?>' class='comment'><?php echo $log->comment?></td>
         </tr>
diff --git a/module/design/view/viewcommit.html.php b/module/design/view/viewcommit.html.php
index 8ed61ddbaf..883dcd88b5 100644
--- a/module/design/view/viewcommit.html.php
+++ b/module/design/view/viewcommit.html.php
@@ -45,7 +45,7 @@
     <?php foreach($design->commit as $commit):?>
       <tr>
         <td title="<?php echo $commit->id;?>"><?php echo html::a(helper::createLink('design', 'revision', "repoID=$commit->id"), "#$commit->id", '_blank');?></td>
-        <td><?php echo $commit->committer;?></td>
+        <td><?php echo zget($users, $commit->committer, $commit->committer);?></td>
         <td><?php echo substr($commit->time, 0, 11);?></td>
         <td title="<?php echo $commit->comment;?>"><?php echo $commit->comment;?></td>
         <td class="c-actions text-center">