Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* adjust assign action of task.

Browse Source
This commit is contained in:
shiyangyangwork@yahoo.cn
2011-12-07 07:50:48 +00:00
parent 638c3150e3
commit bcc02264bb
4 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/lang/en.php
+1 -1
View File
@@ -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>';
module/action/lang/zh-cn.php
+1 -1
View File
@@ -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";
module/common/view/action.html.php
+1
View File
@@ -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>
module/task/model.php
+1 -1
View File
@@ -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)