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

* Fix bug#3736.

Browse Source
This commit is contained in:
hufangzhou
2020-12-08 11:34:35 +08:00
parent d2ddce5e7c
commit 8b291bc6da
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/holiday/model.php
+4
View File
@@ -65,6 +65,8 @@ class holidayModel extends model
{
$holiday = fixer::input('post')->get();
$holiday->year = substr($holiday->begin, 0, 4);
if(helper::isZeroDate($holiday->year)) return dao::$errors['begin'][] = sprintf($this->lang->error->date, $this->lang->holiday->begin);
if(helper::isZeroDate($holiday->end)) return dao::$errors['end'][] = sprintf($this->lang->error->date, $this->lang->holiday->end);
$this->dao->insert(TABLE_HOLIDAY)->data($holiday)
->autoCheck()
@@ -97,6 +99,8 @@ class holidayModel extends model
{
$holiday = fixer::input('post')->get();
$holiday->year = substr($holiday->begin, 0, 4);
if(helper::isZeroDate($holiday->year)) return dao::$errors['begin'][] = sprintf($this->lang->error->date, $this->lang->holiday->begin);
if(helper::isZeroDate($holiday->end)) return dao::$errors['end'][] = sprintf($this->lang->error->date, $this->lang->holiday->end);
$this->dao->update(TABLE_HOLIDAY)
->data($holiday)
module/holiday/view/create.html.php
+3 -3
View File
@@ -28,17 +28,17 @@
</tr>
<tr>
<th><?php echo $lang->holiday->begin;?></th>
<td><?php echo html::input('begin', '', "class='form-control form-date'");?></td>
<td><?php echo html::input('begin', '', "class='form-control form-date' required");?></td>
<td></td>
</tr>
<tr>
<th><?php echo $lang->holiday->end;?></th>
<td><?php echo html::input('end', '', "class='form-control form-date'");?></td>
<td><?php echo html::input('end', '', "class='form-control form-date' required");?></td>
<td></td>
</tr>
<tr>
<th><?php echo $lang->holiday->name;?></th>
<td><?php echo html::input('name', '', "class='form-control'");?></td>
<td><?php echo html::input('name', '', "class='form-control' required");?></td>
<td></td>
</tr>
<tr>
module/holiday/view/edit.html.php
+3 -3
View File
@@ -28,17 +28,17 @@
</tr>
<tr>
<th><?php echo $lang->holiday->begin?></th>
<td><?php echo html::input('begin', $holiday->begin, "class='form-control form-date'")?></td>
<td><?php echo html::input('begin', $holiday->begin, "class='form-control form-date' required")?></td>
<td></td>
</tr>
<tr>
<th><?php echo $lang->holiday->end?></th>
<td><?php echo html::input('end', $holiday->end, "class='form-control form-date'")?></td>
<td><?php echo html::input('end', $holiday->end, "class='form-control form-date' required")?></td>
<td></td>
</tr>
<tr>
<th><?php echo $lang->holiday->name?></th>
<td><?php echo html::input('name', $holiday->name, "class='form-control'")?></td>
<td><?php echo html::input('name', $holiday->name, "class='form-control' required")?></td>
<td></td>
</tr>
<tr>