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

* adjust for change estimate.

Browse Source
This commit is contained in:
wangyidong
2022-08-26 09:14:49 +08:00
parent 66e188605f
commit b27b2c08fa
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/model.php
+3 -1
View File
@@ -2714,14 +2714,16 @@ class taskModel extends model
*
* @param int $taskID
* @param string $account
* @param string $append
* @access public
* @return array
*/
public function getTaskEstimate($taskID, $account = '')
public function getTaskEstimate($taskID, $account = '', $append = '')
{
return $this->dao->select('*')->from(TABLE_TASKESTIMATE)
->where('task')->eq($taskID)
->beginIF($account)->andWhere('account')->eq($account)->fi()
->beginIF($append)->orWhere('append')->eq($append)->fi()
->orderBy('date,id')
->fetchAll();
}
module/task/view/recordestimate.html.php
+1 -1
View File
@@ -61,7 +61,7 @@
<?php
$canOperateEffort = $this->task->canOperateEffort($task, $estimate);
common::printIcon('task', 'editEstimate', "estimateID=$estimate->id", '', 'list', 'pencil', '', 'showinonlybody', true, $canOperateEffort ? '' : 'disabled');
common::printIcon('task', 'deleteEstimate', "estimateID=$estimate->id", '', 'list', 'close', 'hiddenwin', 'showinonlybody', false, ($canOperateEffort and $estimate->left > 0) ? '' : 'disabled');
common::printIcon('task', 'deleteEstimate', "estimateID=$estimate->id", '', 'list', 'close', 'hiddenwin', 'showinonlybody', false, ($canOperateEffort and ($task->mode == 'multi' or ($task->mode == 'linear' and $estimate->left > 0))) ? '' : 'disabled');
?>
</td>
</tr>