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

* Fix check recordWorkhour form data error.

Browse Source
This commit is contained in:
wangyuting
2024-01-11 15:16:26 +08:00
parent 1acffe5ba9
commit 393383399f
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/config/form.php
+4 -4
View File
@@ -189,10 +189,10 @@ $config->task->form->testTask->create['estStartedDitto'] = array('type' => 'arra
$config->task->form->testTask->create['deadlineDitto'] = array('type' => 'array', 'required' => false, 'default' => array());
$config->task->form->recordWorkhour = array();
$config->task->form->recordWorkhour['date'] = array('type' => 'date', 'required' => true, 'default' => array());
$config->task->form->recordWorkhour['work'] = array('type' => 'string', 'required' => true, 'default' => array(), 'base' => true);
$config->task->form->recordWorkhour['consumed'] = array('type' => 'float', 'required' => true, 'default' => array());
$config->task->form->recordWorkhour['left'] = array('type' => 'float', 'required' => false, 'default' => array()); /* Set required to false as the required field can NOT be 0. */
$config->task->form->recordWorkhour['date'] = array('type' => 'date', 'required' => true, 'default' => array());
$config->task->form->recordWorkhour['work'] = array('type' => 'string', 'required' => true, 'default' => array(), 'base' => true);
$config->task->form->recordWorkhour['consumed'] = array('type' => 'string', 'required' => true, 'default' => array());
$config->task->form->recordWorkhour['left'] = array('type' => 'string', 'required' => true, 'default' => array()); /* Set required to false as the required field can NOT be 0. */
$config->task->form->editEffort = array();
$config->task->form->editEffort['date'] = array('type' => 'date', 'required' => true, 'default' => '');
module/task/tao.php
+1 -1
View File
@@ -292,7 +292,7 @@ class taskTao extends taskModel
}
/* Check left hours. */
if(!$left) dao::$errors["left[$id]"] = $this->lang->task->error->left;
if($left === '') dao::$errors["left[$id]"] = $this->lang->task->error->left;
if(!is_numeric($left)) dao::$errors["left[$id]"] = 'ID #' . $id . ' ' . $this->lang->task->error->leftNumber;
if(is_numeric($left) && $left < 0) dao::$errors["left[$id]"] = sprintf($this->lang->error->gt, 'ID #' . $id . ' ' . $this->lang->task->left, '0');
}