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

fixbug_25202

Browse Source
This commit is contained in:
sunjun
2022-07-15 01:12:58 +00:00
parent a7bbc6c953
commit d375ccf6a3
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/model.php
+2 -1
View File
@@ -809,7 +809,7 @@ class taskModel extends model
}
else
{
if($team[$oldTask->assignedTo]->left == 0 && $team[$oldTask->assignedTo]->consumed != 0)
if($team[$oldTask->assignedTo]->left == 0 and $team[$oldTask->assignedTo]->consumed != 0 and $this->app->rawMethod != 'deleteestimate')
{
if($oldTask->assignedTo != $teams[count($teams) - 1])
{
@@ -3738,6 +3738,7 @@ class taskModel extends model
public function getFinishedUsers($taskID = 0, $team = array())
{
$task = $this->getById($taskID);
if($task->activatedDate == '') $task->activatedDate = "0000-00-00";
return $this->dao->select('actor')->from(TABLE_ACTION)
->where('objectType')->eq('task')
->andWhere('objectID')->eq($taskID)
module/task/view/recordestimate.html.php
+1 -1
View File
@@ -60,7 +60,7 @@
<?php if(empty($task->team) or $task->assignedTo == $this->app->user->account or ($task->mode == 'multi' and isset($task->team[$app->user->account]))):?>
<td align='center' class='c-actions'>
<?php
if($this->app->user->admin or $this->app->user->account == $estimate->account)
if($this->app->user->account == $estimate->account)
{
common::printIcon('task', 'editEstimate', "estimateID=$estimate->id", '', 'list', 'pencil', '', 'showinonlybody', true);
common::printIcon('task', 'deleteEstimate', "estimateID=$estimate->id", '', 'list', 'close', 'hiddenwin', 'showinonlybody');