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

* finish task #4912.

Browse Source
This commit is contained in:
wangyidong
2018-09-26 13:49:02 +08:00
parent ce3a23585d
commit 556af243fa
8 changed files with 73 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/model.php
+29 -16
View File
@@ -2447,22 +2447,7 @@ class taskModel extends model
echo $task->realStarted;
break;
case 'assignedTo':
$btnTextClass = '';
$assignedToText = zget($users, $task->assignedTo);
if(empty($task->assignedTo))
{
$btnTextClass = 'text-primary';
$assignedToText = $this->lang->task->noAssigned;
}
if($task->assignedTo == $account) $btnTextClass = 'text-red';
$btnClass = $assignedToText == 'closed' ? ' disabled' : '';
$btnClass = "iframe btn btn-icon-left btn-sm {$btnClass}";
$assignToLink = helper::createLink('task', 'assignTo', "projectID=$task->project&taskID=$task->id", '', true);
$assignToHtml = html::a($assignToLink, "<i class='icon icon-hand-right'></i> <span class='{$btnTextClass}'>{$assignedToText}</span>", '', "class='$btnClass'");
echo !common::hasPriv('task', 'assignTo') ? "<span style='padding-left:25px;' class='{$btnTextClass}'>{$assignedToText}</span>" : $assignToHtml;
$this->printAssignedHtml($task, $users);
break;
case 'assignedDate':
echo substr($task->assignedDate, 5, 11);
@@ -2540,6 +2525,34 @@ class taskModel extends model
}
}
/**
* Print assigned html
*
* @param object $task
* @param array $users
* @access public
* @return void
*/
public function printAssignedHtml($task, $users)
{
$btnTextClass = '';
$assignedToText = zget($users, $task->assignedTo);
if(empty($task->assignedTo))
{
$btnTextClass = 'text-primary';
$assignedToText = $this->lang->task->noAssigned;
}
if($task->assignedTo == $this->app->user->account) $btnTextClass = 'text-red';
$btnClass = $assignedToText == 'closed' ? ' disabled' : '';
$btnClass = "iframe btn btn-icon-left btn-sm {$btnClass}";
$assignToLink = helper::createLink('task', 'assignTo', "projectID=$task->project&taskID=$task->id", '', true);
$assignToHtml = html::a($assignToLink, "<i class='icon icon-hand-right'></i> <span class='{$btnTextClass}'>{$assignedToText}</span>", '', "class='$btnClass'");
echo !common::hasPriv('task', 'assignTo') ? "<span style='padding-left:20px;' class='{$btnTextClass}'>{$assignedToText}</span>" : $assignToHtml;
}
/**
* Send mail.
*