* Fix bug #46879.
This commit is contained in:
@@ -200,4 +200,4 @@ $config->task->form->editEffort = array();
|
||||
$config->task->form->editEffort['date'] = array('type' => 'date', 'required' => true, 'default' => '');
|
||||
$config->task->form->editEffort['work'] = array('type' => 'string', 'required' => false, 'default' => '');
|
||||
$config->task->form->editEffort['consumed'] = array('type' => 'float', 'required' => true, 'default' => '');
|
||||
$config->task->form->editEffort['left'] = array('type' => 'float', 'required' => true, 'default' => '');
|
||||
$config->task->form->editEffort['left'] = array('type' => 'float', 'required' => false, 'default' => '');
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
window.clickSubmit = function()
|
||||
{
|
||||
const isEmpty = !$('#editEffortForm [name=date]').val() || !$('#editEffortForm [name=consumed]').val();
|
||||
const left = $('#editEffortForm [name=left]').val();
|
||||
if(!isEmpty && !isReadonly && (left == 0 || !left))
|
||||
{
|
||||
const formUrl = $('#editEffortForm form').attr('action');
|
||||
const formData = new FormData($("#editEffortForm form")[0]);
|
||||
zui.Modal.confirm(finishTaskTip).then((res) => {
|
||||
if(res) $.ajaxSubmit({url: formUrl, data: formData})
|
||||
});
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -12,11 +12,15 @@ declare(strict_types=1);
|
||||
namespace zin;
|
||||
|
||||
$readonly = !$effort->isLast || (!empty($task->team) && $effort->left == 0);
|
||||
jsVar('isReadonly', $readonly);
|
||||
jsVar('finishTaskTip', $lang->task->confirmRecord);
|
||||
|
||||
modalHeader(set::title($lang->task->editEffort));
|
||||
formPanel
|
||||
(
|
||||
setID('editEffortForm'),
|
||||
set::shadow(!isAjaxRequest('modal')),
|
||||
set::ajax(array('beforeSubmit' => jsRaw("clickSubmit"))),
|
||||
formGroup
|
||||
(
|
||||
set::width('1/3'),
|
||||
|
||||
Reference in New Issue
Block a user