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

fix(Calendar): event event_types definedBy filter not working See merge request tine20/tine20!6619
tine-groupware · Feb 20, 2025 · 8d6156a · 8d6156a
2 parents 7cd7c62 + ed4b97b
commit 8d6156a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/tine20/Calendar/js/EventEditDialog.js b/tine20/Calendar/js/EventEditDialog.js
@@ -116,7 +116,7 @@ Tine.Calendar.EventEditDialog = Ext.extend(Tine.widgets.dialog.EditDialog, {
                             width: 100,
                             // height: 30,
                             xtype: 'label',
-                            text: this.app.i18n._('Event Type')
+                            text: this.app.i18n._('Event Types')
                         }, {
                             flex: 1,
                             xtype:'tinerecordspickercombobox',

diff --git a/tine20/Calendar/js/Model/Event.js b/tine20/Calendar/js/Model/Event.js
@@ -47,7 +47,13 @@ const Event = Record.create(Record.genericFields.concat([
     { name: 'tags' },
     { name: 'notes'},
     { name: 'attachments'},
-    { name: 'event_types'},
+    { name: 'event_types', fieldDefinition: {config: {
+        // we need some fieldDef to get filter working
+        appName: 'Calendar',
+        modelName: 'EventTypes',
+        refIdField: 'record',
+        dependentRecords: true
+    }}},
     //{ name: 'contact' },
     //{ name: 'related' },
     //{ name: 'resources' },
@@ -512,7 +518,7 @@ Event.getFilterModel = function() {
         ];
 
     if (app.featureEnabled('featureEventType')) {
-        filter.push({filtertype: 'foreignrecord', linkType: 'foreignId', app: app, foreignRecordClass: 'Calendar.EventTypes', ownField: 'event_types', foreignRefIdField: 'eventType'});
+        filter.push({filtertype: 'foreignrecord', linkType: 'foreignId', app: app, ownRecordClass: 'Calendar.Event', ownField: 'event_types', foreignRecordClass: 'Calendar.EventTypes'});
     }
     if (Tine.Tinebase.featureEnabled('featureSite')) {
         filter.push({filtertype: 'tinebase.site', app: app});