Merge branch '2024.11'

tine-groupware · Oct 15, 2024 · ed10962 · ed10962
2 parents 085da1d + 6698d48
commit ed10962
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/tine20/Tinebase/js/ApplicationStarter.js b/tine20/Tinebase/js/ApplicationStarter.js
@@ -288,6 +288,7 @@ Ext.apply(Tine.Tinebase.ApplicationStarter,{
             fieldconfig = fieldconfig.config || {};
         }
         const filterOptions = _.get(fieldconfig, 'config.filterOptions', {});
+        Object.assign(filterconfig, _.get(fieldconfig, 'uiconfig.filterOptions', {}));
 
         const appName = modelConfig.appName;
         const modelName = modelConfig.modelName;