Merge branch 'pu/cw/calCSFixes' into 'main'

Pu/cw/cal cs fixes See merge request tine20/tine20!6607
tine-groupware · Feb 18, 2025 · 63f660c · 63f660c
2 parents ec94219 + f92757a
commit 63f660c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/tine20/Calendar/js/Model/Event.js b/tine20/Calendar/js/Model/Event.js
@@ -512,7 +512,7 @@ Event.getFilterModel = function() {
         ];
 
     if (app.featureEnabled('featureEventType')) {
-        filter.push({filtertype: 'foreignrecord', linkType: 'foreignId', app: app, foreignRecordClass: EventTypes, ownField: 'event_types', foreignRefIdField: 'eventType'});
+        filter.push({filtertype: 'foreignrecord', linkType: 'foreignId', app: app, foreignRecordClass: 'Calendar.EventTypes', ownField: 'event_types', foreignRefIdField: 'eventType'});
     }
     if (Tine.Tinebase.featureEnabled('featureSite')) {
         filter.push({filtertype: 'tinebase.site', app: app});

diff --git a/tine20/Tinebase/js/widgets/form/FieldManager.js b/tine20/Tinebase/js/widgets/form/FieldManager.js
@@ -107,6 +107,9 @@ Tine.widgets.form.FieldManager = function() {
                 // class icon_dialog_info needs to be defined in css of app
                 field.fieldLabel += '<span class="field-description" ext:qtip="' + Ext.util.Format.htmlEncode(i18n._hidden(fieldDefinition.description)) + '" />'
             }
+            if (field.emptyText) {
+                field.emptyText = i18n._hidden(field.emptyText);
+            }
             field.name = fieldDefinition.fieldName || fieldDefinition.name;
             field.readOnly = !! fieldDefinition.readOnly || !! _.get(fieldDefinition, 'uiconfig.readOnly');
             field.allowBlank = !! (fieldDefinition.validators && fieldDefinition.validators.allowEmpty);