Changeset 872

Timestamp:

Apr 6, 2020, 9:59:59 PM (4 years ago)

Author:

chronos

Message:

• Fixed: Init default value even if Default index is not defined.
• Fixed: Null value support also for Date and Time form types.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Common/Form/Form.php (modified) (1 diff)
• Common/Form/Types/Date.php (modified) (2 diffs)
• Common/Form/Types/Time.php (modified) (2 diffs)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 871; // Subversion revision
+$Revision = 872; // Subversion revision
 $DatabaseRevision = 870; // SQL structure revision
 $ReleaseTime = strtotime('2020-04-06');

trunk/Common/Form/Form.php

@@ -50 +50 @@
       {
         if (!array_key_exists($Index, $this->Values))
-          $this->Values[$Index] = $Item['Default'];
+        {
+          if (isset($Item['Default'])) $this->Values[$Index] = $Item['Default'];
+            else $this->Values[$Index] = null;
+        }
       }
     }

trunk/Common/Form/Types/Date.php

@@ -23 +23 @@
     global $MonthNames;
 
-    if(($Item['Value'] !== null) and ((strtolower($Item['Value']) == 'now') or (strtolower($Item['Value']) == ''))) $Item['Value'] = time();
+    if (($Item['Value'] == null) or (($Item['Value'] !== null) and ((strtolower($Item['Value']) == 'now') or (strtolower($Item['Value']) == ''))))
+    {
+      $Item['Value'] = time();
+      $IsNull = true;
+    } else $IsNull = false;
     $Parts = getdate($Item['Value']);
 
@@ -30 +34 @@
     if(array_key_exists('Null', $Item) and $Item['Null'])
     {
-      if($Item['Value'] != null)
+      if(!$IsNull)
       {
         $Checked = ' checked="1"';

trunk/Common/Form/Types/Time.php

@@ -19 +19 @@
   function OnEdit($Item)
   {
-    if(($Item['Value'] !== null) and ((strtolower($Item['Value']) == 'now') or (strtolower($Item['Value']) == ''))) $Item['Value'] = time();
-    $TimeParts = getdate($Item['Value']);
+    if (($Item['Value'] == null) or (($Item['Value'] !== null) and ((strtolower($Item['Value']) == 'now') or (strtolower($Item['Value']) == ''))))
+    {
+      $Item['Value'] = time();
+      $IsNull = true;
+    } else $IsNull = false;
+    $Parts = getdate($Item['Value']);
 
     $Output = '';
@@ -26 +30 @@
     if(array_key_exists('Null', $Item) and $Item['Null'])
     {
-      if($Item['Value'] != null)
+      if($IsNull)
       {
         $Checked = ' checked="1"';