diff --git a/module/task/model.php b/module/task/model.php index da8538011e..717fbfcf1e 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -1075,6 +1075,7 @@ 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() diff --git a/module/task/view/batchedit.html.php b/module/task/view/batchedit.html.php index a905387ae7..6cd57031aa 100755 --- a/module/task/view/batchedit.html.php +++ b/module/task/view/batchedit.html.php @@ -58,7 +58,7 @@ '>task->status;?> '>task->pri;?> '>task->estimateAB;?> - '>task->consumed;?> + '>task->consumedThisTime;?> '>task->leftAB?> '>task->estStarted?> '>task->deadline?>