* Finish task #5892.
This commit is contained in:
@@ -0,0 +1,11 @@
|
||||
$(function()
|
||||
{
|
||||
$('#currentConsumed').keyup(function()
|
||||
{
|
||||
var currentConsumed = $(this).val();
|
||||
if(!parseInt(currentConsumed)) currentConsumed = 0;
|
||||
var total = parseInt(currentConsumed) + parseInt(consumed);
|
||||
$('#totalConsumed').html(total);
|
||||
$('#consumed').val(total);
|
||||
})
|
||||
})
|
||||
@@ -185,7 +185,7 @@ $lang->task->noTask = 'No tasks yet. ';
|
||||
$lang->task->createDenied = 'Create Task is denied in this project';
|
||||
|
||||
$lang->task->error = new stdclass();
|
||||
$lang->task->error->consumedNumber = '"Hours Cost" must be numbers.';
|
||||
$lang->task->error->consumedNumber = '"Current Cost" must be numbers.';
|
||||
$lang->task->error->estimateNumber = '"Estimates" must be numbers.';
|
||||
$lang->task->error->consumedSmall = '"Hours Cost" must be > the last number.';
|
||||
$lang->task->error->consumedThisTime = 'Please enter "Hours Cost"';
|
||||
|
||||
@@ -185,7 +185,7 @@ $lang->task->noTask = '暂时没有任务。';
|
||||
$lang->task->createDenied = '你不能在该项目添加任务';
|
||||
|
||||
$lang->task->error = new stdclass();
|
||||
$lang->task->error->consumedNumber = '"已经消耗"必须为数字';
|
||||
$lang->task->error->consumedNumber = '"本次消耗"必须为数字';
|
||||
$lang->task->error->estimateNumber = '"预计剩余"必须为数字';
|
||||
$lang->task->error->consumedSmall = '"已经消耗"必须大于之前消耗';
|
||||
$lang->task->error->consumedThisTime = '请填写"工时"';
|
||||
|
||||
@@ -1289,7 +1289,7 @@ class taskModel extends model
|
||||
->remove('comment,files,labels,currentConsumed')
|
||||
->get();
|
||||
|
||||
if(!is_numeric($task->consumed))
|
||||
if(!is_numeric($this->post->currentConsumed))
|
||||
{
|
||||
dao::$errors[] = $this->lang->task->error->consumedNumber;
|
||||
return false;
|
||||
|
||||
Reference in New Issue
Block a user