Changeset 941

Timestamp:

Aug 2, 2022, 5:41:41 PM (2 years ago)

Author:

chronos

Message:

• Fixed: DateTime type null value handling.

Location:

trunk

Files:

• Common/Form/Form.php (modified) (1 diff)
• Modules/Customer/Customer.php (modified) (1 diff)

trunk/Common/Form/Form.php

@@ -83 +83 @@
     $Item = $this->Definition['Items'][$Index];
     $UseType = $this->GetItemType($Item);    
-    return $this->FormManager->Type->ExecuteTypeEvent($UseType, $Event,
+    
+    $Result = $this->FormManager->Type->ExecuteTypeEvent($UseType, $Event,
       array('Value' => $this->Values[$Index], 'Name' => $Index,
       'Type' => $Item['Type'], 'Values' => $this->Values,
       'Filter' => $this->Values[$Index]));
+    if ($Result == null) return '';
+    return $Result;
   }
 

trunk/Modules/Customer/Customer.php

@@ -39 +39 @@
         'Consumption' => array('Type' => 'TCustomerStockSerialNumber', 'Caption' => 'Spotřeba zařízení', 'Default' => ''),
         'Contract' => array('Type' => 'TContract', 'Caption' => 'Smlouva', 'Default' => '', 'Null' => true),
-        'PaymentEmailTime' => array('Type' => 'DateTime', 'Caption' => 'Čas platebního emailu', 'Default' => 'NOW()', 'Null' => true, 'NotInList' => true),
+        'PaymentEmailTime' => array('Type' => 'DateTime', 'Caption' => 'Čas platebního emailu', 'Default' => 'now', 'Null' => true, 'NotInList' => true),
         'ChangeAction' => array('Type' => 'TActionEnum', 'Caption' => 'Změna - akce', 'Default' => '', 'Null' => true),
         'ChangeTime' => array('Type' => 'DateTime', 'Caption' => 'Změna - čas', 'Default' => '', 'Null' => true, 'NotInList' => true),