From 53ed09473eea589b5b6f2ed39f5d91ec6ff4b869 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= <memory@lvtao.net>
Date: Mon, 15 Jan 2018 14:58:11 +0800
Subject: [PATCH] * Fix Bug#1386

---
 module/block/view/taskblock.html.php   |  2 +-
 module/project/view/grouptask.html.php |  4 ++--
 module/task/model.php                  | 11 ++++++-----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/module/block/view/taskblock.html.php b/module/block/view/taskblock.html.php
index e5e611d872..60c6eafb32 100644
--- a/module/block/view/taskblock.html.php
+++ b/module/block/view/taskblock.html.php
@@ -31,7 +31,7 @@ td.delayed{background: #e84e0f!important; color: white;}
   ?>
   <tr data-url='<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink); ?>' <?php echo $appid?>>
     <td class='text-center'><?php echo $task->id;?></td>
-    <td class='text-center'><?php echo zget(array_keys($lang->task->priList), $task->pri, $task->pri)?></td>
+    <td class='text-center'><?php echo zget($lang->task->priList, $task->pri, $task->pri)?></td>
     <td style='color: <?php echo $task->color?>' title='<?php echo $task->name?>'><?php echo $task->name?></td>
     <td class='text-center'><?php echo $task->estimate?></td>
     <td class='<?php if(isset($task->delay)) echo 'delayed';?>'><?php if(substr($task->deadline, 0, 4) > 0) echo $task->deadline;?></td>
diff --git a/module/project/view/grouptask.html.php b/module/project/view/grouptask.html.php
index bb798c8d78..2233c58111 100644
--- a/module/project/view/grouptask.html.php
+++ b/module/project/view/grouptask.html.php
@@ -55,7 +55,7 @@
     $groupWait     = 0;
     $groupDone     = 0;
     $groupDoing    = 0;
-    $groupClosed   = 0;  
+    $groupClosed   = 0;
     $groupEstimate = 0.0;
     $groupConsumed = 0.0;
     $groupLeft     = 0.0;
@@ -113,7 +113,7 @@
       </td>
       <?php endif;?>
       <td><?php echo $task->id;?></td>
-      <td><span class='<?php echo 'pri' . zget(array_keys($lang->task->priList), $task->pri, $task->pri)?>'><?php echo zget(array_keys($lang->task->priList), $task->pri, $task->pri);?></span></td>
+      <td><span class='<?php echo 'pri' . zget($lang->task->priList, $task->pri, $task->pri)?>'><?php echo zget($lang->task->priList, $task->pri, $task->pri);?></span></td>
       <td class='text-left'>
           <?php
             if(!empty($task->team))   echo '<span class="label">' . $lang->task->multipleAB . '</span> ';
diff --git a/module/task/model.php b/module/task/model.php
index de9498b0ea..4b4ff3bd74 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -672,6 +672,7 @@ class taskModel extends model
             $task->status       = 'done';
             $task->finishedBy   = $oldTask->openedBy; // Fix bug#1341
             $task->finishedDate = helper::now();
+            $task->assignedTo   = $oldTask->openedBy; // Fix bug#1341
         }
         else
         {
@@ -741,7 +742,7 @@ class taskModel extends model
      *
      * @param  int    $taskID
      * @access public
-     * @return void
+     * @return array
      */
     public function recordEstimate($taskID)
     {
@@ -2264,8 +2265,8 @@ class taskModel extends model
 
     /**
      * Get mail subject.
-     * 
-     * @param  object    $task 
+     *
+     * @param  object    $task
      * @access public
      * @return string
      */
@@ -2277,8 +2278,8 @@ class taskModel extends model
 
     /**
      * Get toList and ccList.
-     * 
-     * @param  object    $task 
+     *
+     * @param  object    $task
      * @access public
      * @return bool|array
      */