From 0095192c32ff72772189bf595b700fa64fa0ff2a Mon Sep 17 00:00:00 2001 From: wangyidong Date: Wed, 31 Aug 2022 16:49:21 +0800 Subject: [PATCH] * fix bug for record estimate. --- module/task/model.php | 2 +- module/task/view/recordestimate.html.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/task/model.php b/module/task/model.php index abb2be30ee..ccd5b0d6ca 100755 --- a/module/task/model.php +++ b/module/task/model.php @@ -1773,7 +1773,7 @@ class taskModel extends model $task = $this->dao->select('*')->from(TABLE_TASK)->where('id')->eq($taskID)->fetch();; $task->team = $this->dao->select('*')->from(TABLE_TASKTEAM)->where('task')->eq($taskID)->orderBy('order')->fetchAll('id'); $earliestTime = ''; - foreach(array_keys($record->id) as $id) + foreach(array_keys($record->dates) as $id) { if($earliestTime == '') { diff --git a/module/task/view/recordestimate.html.php b/module/task/view/recordestimate.html.php index 729310c857..15fe706df3 100644 --- a/module/task/view/recordestimate.html.php +++ b/module/task/view/recordestimate.html.php @@ -55,7 +55,7 @@ task->canOperateEffort($task, $estimate); common::printIcon('task', 'editEstimate', "estimateID=$estimate->id", '', 'list', 'edit', '', 'showinonlybody', true, $canOperateEffort ? '' : 'disabled'); - common::printIcon('task', 'deleteEstimate', "estimateID=$estimate->id", '', 'list', 'trash', 'hiddenwin', 'showinonlybody', false, ($canOperateEffort and ($task->mode != 'multi' or ($task->mode == 'linear' and $estimate->left > 0))) ? '' : 'disabled'); + common::printIcon('task', 'deleteEstimate', "estimateID=$estimate->id", '', 'list', 'trash', 'hiddenwin', 'showinonlybody', false, ($canOperateEffort and ($task->mode != 'linear' or ($task->mode == 'linear' and $estimate->left > 0))) ? '' : 'disabled'); ?>