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

Merge branch '18.x' into zentaoipd

Browse Source
This commit is contained in:
tanghucheng
2023-07-13 17:26:49 +08:00
parent 1de24291af ef9792133e
commit 6b0db86d24
92 changed files with 5166 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/todo/model.php
+11 -8
View File
@@ -78,15 +78,18 @@ class todoModel extends model
{
unset($todo->config['week']);
unset($todo->config['month']);
if(!$todo->config['day'])
if(empty($todo->config['specifiedDate']))
{
dao::$errors[] = sprintf($this->lang->error->notempty, $this->lang->todo->cycleDaysLabel);
return false;
}
if(!validater::checkInt($todo->config['day']))
{
dao::$errors[] = sprintf($this->lang->error->int[0], $this->lang->todo->cycleDaysLabel);
return false;
if(!$todo->config['day'])
{
dao::$errors[] = sprintf($this->lang->error->notempty, $this->lang->todo->cycleDaysLabel);
return false;
}
if(!validater::checkInt($todo->config['day']))
{
dao::$errors[] = sprintf($this->lang->error->int[0], $this->lang->todo->cycleDaysLabel);
return false;
}
}
}
if($todo->config['type'] == 'week')