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

* Fix typo, cencel to cancel.

Browse Source
This commit is contained in:
dingguodong
2023-08-24 16:30:32 +08:00
parent 140ca16b43
commit 4d46cb2ca9
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/model.php
+1 -1
View File
@@ -2440,7 +2440,7 @@ class taskModel extends model
$myself = new self();
if($task->mode == 'linear')
{
if($action == 'assignto' && !in_array($task->status, array('done', 'cencel', 'closed'))) return false;
if($action == 'assignto' && !in_array($task->status, array('done', 'cancel', 'closed'))) return false;
if($action == 'start' && in_array($task->status, array('wait', 'doing')))
{
if($task->assignedTo != $app->user->account) return false;
module/task/ui/assignto.html.php
+1 -1
View File
@@ -26,7 +26,7 @@ formPanel
set::width("1/3"),
set::name("assignedTo"),
set::label($lang->task->assignedTo),
set::value((empty($task->team) or strpos('done,cencel,closed', $task->status) !== false) ? $task->assignedTo : $task->nextUser),
set::value((empty($task->team) or strpos('done,cancel,closed', $task->status) !== false) ? $task->assignedTo : $task->nextUser),
set::control("picker"),
set::items($members)
),
module/task/view/assignto.html.php
+2 -2
View File
@@ -38,8 +38,8 @@
<form method='post' target='hiddenwin'>
<table class='table table-form'>
<tr>
<th class='w-80px'><?php echo (empty($task->team) or strpos('done,cencel,closed', $task->status) !== false) ? $lang->task->assign : $lang->task->transferTo;?></th>
<td class='w-p25-f'><?php echo html::select('assignedTo', $members, (empty($task->team) or strpos('done,cencel,closed', $task->status) !== false) ? $task->assignedTo : $task->nextUser, "class='form-control chosen'");?></td><td></td>
<th class='w-80px'><?php echo (empty($task->team) or strpos('done,cancel,closed', $task->status) !== false) ? $lang->task->assign : $lang->task->transferTo;?></th>
<td class='w-p25-f'><?php echo html::select('assignedTo', $members, (empty($task->team) or strpos('done,cancel,closed', $task->status) !== false) ? $task->assignedTo : $task->nextUser, "class='form-control chosen'");?></td><td></td>
</tr>
<?php if($task->status != 'done' and $task->status != 'closed' and $task->parent >= 0):?>
<tr>
module/task/view/view.html.php
+1 -1
View File
@@ -255,7 +255,7 @@
<th><?php echo $lang->task->assignedTo;?></th>
<td>
<?php
if(!empty($task->team) and $task->mode == 'multi' and strpos('done,cencel,closed', $task->status) === false)
if(!empty($task->team) and $task->mode == 'multi' and strpos('done,cancel,closed', $task->status) === false)
{
foreach($task->team as $member) echo ' ' . zget($users, $member->account);
}