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

Merge branch 'master' of github.com:easysoft/zentaopms

Browse Source
This commit is contained in:
z
2020-08-10 13:38:06 +08:00
parent cad991a948 29bc6f6df5
commit f25c68666d
5 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/model.php
+2 -2
View File
@@ -1056,8 +1056,9 @@ class taskModel extends model
}
/* Check field not empty. */
foreach($tasks as $task)
foreach($tasks as $taskID => $task)
{
if($task->status == 'done' and $task->consumed == false) die(js::error('task#' . $taskID . sprintf($this->lang->error->notempty, $this->lang->task->consumedThisTime)));
if($task->status == 'cancel') continue;
foreach(explode(',', $this->config->task->edit->requiredFields) as $field)
{
@@ -1075,7 +1076,6 @@ class taskModel extends model
foreach($tasks as $taskID => $task)
{
if($task->status == 'done' and $task->consumed == false) die(js::error('task#' . $taskID . sprintf($this->lang->error->notempty, $this->lang->task->consumedThisTime)));
$oldTask = $oldTasks[$taskID];
$this->dao->update(TABLE_TASK)->data($task)
->autoCheck()
module/task/view/batchedit.html.php
+6 -2
View File
@@ -90,10 +90,14 @@
<?php $disableAssignedTo = (isset($teams[$taskID]) and $tasks[$taskID]->assignedTo != $this->app->user->account) ? "disabled='disabled'" : '';?>
<?php $disableHour = isset($teams[$taskID]) ? "disabled='disabled'" : '';?>
<?php
$taskMembers = array();
if(isset($teams[$taskID]))
{
$taskMembers = array_intersect_key($members, $teams[$taskID]);
$taskMembers = array('' => '', 'ditto' => $this->lang->task->ditto) + $taskMembers;
$teamAccounts = array_keys($teams[$taskID]);
foreach($teamAccounts as $teamAccount)
{
$taskMembers[] = $members[$teamAccount];
}
}
else
{
module/task/view/edit.html.php
+15
View File
@@ -122,6 +122,21 @@
<tr>
<th><?php echo $lang->task->assignedTo;?></th>
<?php $disableAssignedTo = (!empty($task->team) and $task->assignedTo != $this->app->user->account) ? "disabled='disabled'" :'';?>
<?php
$taskMembers = array();
if(!empty($task->team))
{
$teamAccounts = array_keys($task->team);
foreach($teamAccounts as $teamAccount)
{
$taskMembers[] = $members[$teamAccount];
}
}
else
{
$taskMembers = $members;
}
?>
<?php $taskMembers = !empty($task->team) ? array_intersect_key($members, $task->team) : $members;?>
<td><span id="assignedToIdBox"><?php echo html::select('assignedTo', $taskMembers, $task->assignedTo, "class='form-control chosen' {$disableAssignedTo}");?></span></td>
</tr>