From bcc02264bb8d908867adce4aee1de7190aa83712 Mon Sep 17 00:00:00 2001
From: "shiyangyangwork@yahoo.cn" <shiyangyang@cnezsoft.com>
Date: Wed, 7 Dec 2011 07:50:48 +0000
Subject: [PATCH]  * adjust assign action of task.

---
 module/action/lang/en.php          | 2 +-
 module/action/lang/zh-cn.php       | 2 +-
 module/common/view/action.html.php | 1 +
 module/task/model.php              | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/module/action/lang/en.php b/module/action/lang/en.php
index 9b9211cb7d..87a0800666 100644
--- a/module/action/lang/en.php
+++ b/module/action/lang/en.php
@@ -52,7 +52,7 @@ $lang->action->desc->opened      = '$date, Opened by <strong>$actor</strong>.';
 $lang->action->desc->created     = '$date, Created by <strong>$actor</strong>.';
 $lang->action->desc->changed     = '$date, Changed by <strong>$actor</strong>.';
 $lang->action->desc->edited      = '$date, Edited by <strong>$actor</strong>.';
-$lang->action->desc->assigned    = '$date, Assigned by<strong>$actor</strong>.' . "\n";
+$lang->action->desc->assigned    = '$date, <strong>$actor</strong> assigned task to <strong>$extra</strong>.' . "\n";
 $lang->action->desc->closed      = '$date, Closed by <strong>$actor</strong>.';
 $lang->action->desc->deleted     = '$date, Deleted by <strong>$actor</strong>.';
 $lang->action->desc->deletedfile = '$date, Deleted file by <strong>$actor</strong>, the file is <strong><i>$extra</i></strong>';
diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php
index f7a1b3baa6..76f9f6cc10 100644
--- a/module/action/lang/zh-cn.php
+++ b/module/action/lang/zh-cn.php
@@ -52,7 +52,7 @@ $lang->action->desc->opened      = '$date, 由 <strong>$actor</strong> 创建。
 $lang->action->desc->created     = '$date, 由 <strong>$actor</strong> 创建。' . "\n";
 $lang->action->desc->changed     = '$date, 由 <strong>$actor</strong> 变更。' . "\n";
 $lang->action->desc->edited      = '$date, 由 <strong>$actor</strong> 编辑。' . "\n";
-$lang->action->desc->assigned    = '$date, 由 <strong>$actor</strong> 指派。' . "\n";
+$lang->action->desc->assigned    = '$date, 由 <strong>$actor</strong> 指派给 <strong>$extra</strong>' . "\n";
 $lang->action->desc->closed      = '$date, 由 <strong>$actor</strong> 关闭。' . "\n";
 $lang->action->desc->deleted     = '$date, 由 <strong>$actor</strong> 删除。' . "\n";
 $lang->action->desc->deletedfile = '$date, 由 <strong>$actor</strong> 删除了附件：<strong><i>$extra</i></strong>' . "\n";
diff --git a/module/common/view/action.html.php b/module/common/view/action.html.php
index d4cc2d63b1..8a7fc5a9d2 100644
--- a/module/common/view/action.html.php
+++ b/module/common/view/action.html.php
@@ -41,6 +41,7 @@ function switchChange(historyID,type)
     <li value='<?php echo $i ++;?>'>
       <?php
       if(isset($users[$action->actor])) $action->actor = $users[$action->actor];
+      if($action->action == 'assigned' and isset($users[$action->extra]) ) $action->extra = $users[$action->extra];
       if(strpos($action->actor, ':') !== false) $action->actor = substr($action->actor, strpos($action->actor, ':') + 1);
       ?>
       <span>
diff --git a/module/task/model.php b/module/task/model.php
index 4c72bc8e0a..d01b919f89 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -221,7 +221,7 @@ class taskModel extends model
             ->set('lastEditedDate')->eq($now)
             ->where('id')->eq($taskID)->exec();
 
-        $actionID = $this->loadModel('action')->create('task', $taskID, 'Assigned', $this->post->comment);
+        $actionID = $this->loadModel('action')->create('task', $taskID, 'Assigned', $this->post->comment, $this->post->assignedTo);
         $this->dao->insert(TABLE_HISTORY)
             ->set('company')->eq(1)
             ->set('action')->eq($actionID)