diff --git a/module/holiday/config.php b/module/holiday/config.php index f323977830..f46a285b1e 100644 --- a/module/holiday/config.php +++ b/module/holiday/config.php @@ -1,5 +1,5 @@ holiday)) $config->holiday = new stdclass(); $config->holiday->require = new stdclass(); -$config->holiday->require->create = 'name,begin,end,year'; -$config->holiday->require->edit = 'name,begin,end,year'; +$config->holiday->require->create = 'name,begin,end'; +$config->holiday->require->edit = 'name,begin,end'; diff --git a/module/holiday/model.php b/module/holiday/model.php index 419eedbb56..45b52344d4 100644 --- a/module/holiday/model.php +++ b/module/holiday/model.php @@ -66,26 +66,23 @@ class holidayModel extends model $holiday = fixer::input('post')->get(); $holiday->year = substr($holiday->begin, 0, 4); - $this->dao->insert(TABLE_HOLIDAY) - ->data($holiday) + $this->dao->insert(TABLE_HOLIDAY)->data($holiday) ->autoCheck() ->batchCheck($this->config->holiday->require->create, 'notempty') ->check('end', 'ge', $holiday->begin) ->exec(); + if(dao::isError()) return false; - if(!dao::isError()) - { - $beginDate = $this->post->begin; - $endDate = $this->post->end; + $beginDate = $this->post->begin; + $endDate = $this->post->end; - /* Update project. */ - $this->updateProjectPlanDuration($beginDate, $endDate); - $this->updateProjectRealDuration($beginDate, $endDate); + /* Update project. */ + $this->updateProjectPlanDuration($beginDate, $endDate); + $this->updateProjectRealDuration($beginDate, $endDate); - /* Update task. */ - $this->updateTaskPlanDuration($beginDate, $endDate); - $this->updateTaskRealDuration($beginDate, $endDate); - } + /* Update task. */ + $this->updateTaskPlanDuration($beginDate, $endDate); + $this->updateTaskRealDuration($beginDate, $endDate); return $this->dao->lastInsertID(); }