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

* Set the default of date field is null.

Browse Source
This commit is contained in:
daitingting
2023-04-27 08:46:06 +00:00
parent 5b8b82673f
commit 7032ccdb45
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/pivot/model.php
+1 -1
View File
@@ -139,7 +139,7 @@ class pivotModel extends model
*/
public function processDateVar($var, $type = 'date')
{
if(empty($var)) return $var;
if(empty($var)) return NULL;
$format = $type == 'datetime' ? 'Y-m-d H:i:s' : 'Y-m-d';
switch($var)
module/upgrade/model.php
+8 -1
View File
@@ -9141,7 +9141,14 @@ class upgradeModel extends model
$sql = $data->sql;
if(!empty($filters))
{
foreach($filters as $filter) $sql = str_replace('$' . $filter->field, "'{$filter->default}'", $sql);
foreach($filters as $filter)
{
$filterDefault = isset($filter->default) ? $filter->default : '';
if($filter->type == 'date') $filterDefault = $this->pivot->processDateVar($filterDefault);
$filterDefault = $filterDefault === NULL ? "NULL" : "'{$filterDefault}'";
$sql = str_replace('$' . $filter->field, $filterDefault, $sql);
}
}
$fieldSettings = $this->getFieldSettings($sql);