Skip to content

Commit

Permalink
Merge branch 'pu/cf/rt/228704' into '2024.11'
Browse files Browse the repository at this point in the history
fix(Tinebase/Customfields): dupblicate cf filter

See merge request tine20/tine20!4728
  • Loading branch information
Christian Feitl committed Jan 10, 2024
2 parents 0ef438c + 2247dac commit ea32499
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion tine20/Tinebase/js/widgets/grid/GridPanel.js
Original file line number Diff line number Diff line change
Expand Up @@ -2278,7 +2278,7 @@ Ext.extend(Tine.widgets.grid.GridPanel, Ext.Panel, {
return new Tine.widgets.grid.FilterPanel(Ext.apply(config, {
app: this.app,
recordClass: this.recordClass,
filterModels: this.recordClass.getFilterModel().concat(Tine.widgets.customfields.FilterModel.prototype.getCustomfieldFilters(this.recordClass)),
filterModels: this.recordClass.getFilterModel(),
defaultFilter: 'query',
filters: this.defaultFilters || []
}));
Expand Down

0 comments on commit ea32499

Please sign in to comment.