From cfa64fdc4eeb75ad1ed4d7fb2df90297e1bf9561 Mon Sep 17 00:00:00 2001
From: Yagami <sgm0422@qq.com>
Date: Thu, 8 Nov 2018 14:20:46 +0800
Subject: [PATCH] * Finish task #5065.

---
 module/bug/control.php        |  2 +-
 module/doc/view/view.html.php | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/module/bug/control.php b/module/bug/control.php
index bc2d817199..6887e47100 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -1010,7 +1010,7 @@ class bug extends control
 
         $bug        = $this->bug->getById($bugID);
         $productID  = $bug->product;
-        $users      = $this->user->getPairs();
+        $users      = $this->user->getPairs('noclosed');
         $assignedTo = $bug->openedBy;
         if(!isset($users[$assignedTo])) $assignedTo = $this->bug->getModuleOwner($bug->module, $productID);
         unset($this->lang->bug->resolutionList['tostory']);
diff --git a/module/doc/view/view.html.php b/module/doc/view/view.html.php
index 4cfe771bbf..5532c60c31 100644
--- a/module/doc/view/view.html.php
+++ b/module/doc/view/view.html.php
@@ -96,9 +96,6 @@
           <?php endforeach;?>
         </div>
       </div>
-      <?php echo $this->fetch('file', 'printFiles', array('files' => $doc->files, 'fieldset' => 'true'));?>
-      <?php $actionFormLink = $this->createLink('action', 'comment', "objectType=doc&objectID=$doc->id");?>
-      <?php include '../../common/view/action.html.php';?>
     </div>
     <div class='main-actions'>
       <div class="btn-toolbar">
@@ -178,6 +175,13 @@
         </div>
       </details>
     </div>
+    <div class='cell'>
+      <?php $actionFormLink = $this->createLink('action', 'comment', "objectType=doc&objectID=$doc->id");?>
+      <?php include '../../common/view/action.html.php';?>
+    </div>
+    <div class='cell'>
+      <?php echo $this->fetch('file', 'printFiles', array('files' => $doc->files, 'fieldset' => 'true'));?>
+    </div>
   </div>
 </div>