Merge branch 'pu/ccheng/fmail_defaultdata' into '2024.11'

fix(Tinebase/js): get default data from model config See merge request tine20/tine20!4798
tine-groupware · Jan 24, 2024 · e1996a4 · e1996a4
2 parents 4d9ab5d + ae6f09e
commit e1996a4
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/tine20/Tinebase/js/ApplicationStarter.js b/tine20/Tinebase/js/ApplicationStarter.js
@@ -89,7 +89,7 @@ Ext.apply(Tine.Tinebase.ApplicationStarter,{
             name: key,
             fieldDefinition: fieldDefinition
         };
-
+        
         if (fieldDefinition.type) {
             // add pre defined type
             field.type = this.types[fieldDefinition.type];
@@ -114,9 +114,15 @@ Ext.apply(Tine.Tinebase.ApplicationStarter,{
                 || (fieldDefinition.nullable)) {
                 field.defaultValue = null;
             }
+            if (fieldDefinition.hasOwnProperty('validators')) {
+                if (fieldDefinition['validators']['default']) {
+                    field.defaultValue = fieldDefinition['validators']['default'];
+                }
+            }
             if (fieldDefinition.hasOwnProperty('default')) {
                 field.defaultValue = fieldDefinition['default'];
             }
+
             // allow overwriting date pattern in model
             if (fieldDefinition.hasOwnProperty('dateFormat')) {
                 field.dateFormat = fieldDefinition.dateFormat;