fix(Tinebase/js): enable filter panel syncFields feature

tine-groupware · Mar 18, 2024 · 6045e47 · 6045e47
1 parent b8bd482
commit 6045e47
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/tine20/Calendar/js/MainScreenCenterPanel.js b/tine20/Calendar/js/MainScreenCenterPanel.js
@@ -116,7 +116,7 @@ Tine.Calendar.MainScreenCenterPanel = Ext.extend(Ext.Panel, {
         ];
         this.filterToolbar = this.getFilterToolbar({
             onFilterChange: this.refresh.createDelegate(this, [false]),
-            getAllFilterData: this.getAllFilterData.createDelegate(this)
+            getAllFilterData: this.getAllFilterData.createDelegate(this),
         });
 
         this.filterToolbar.getQuickFilterPlugin().criteriaIgnores.push(

diff --git a/tine20/Tinebase/js/widgets/grid/FilterPanel.js b/tine20/Tinebase/js/widgets/grid/FilterPanel.js
@@ -9,7 +9,7 @@ Ext.ns('Tine.widgets.grid');
 
 Tine.widgets.grid.FilterPanel = function(config) {
     this.filterToolbarConfig = config;
-    Ext.copyTo(this, config, 'useQuickFilter,quickFilterConfig');
+    Ext.copyTo(this, config, 'useQuickFilter, quickFilterConfig, syncFields');
 
     // the plugins won't work there
     delete this.filterToolbarConfig.plugins;
@@ -85,9 +85,10 @@ Ext.extend(Tine.widgets.grid.FilterPanel, Ext.Panel, {
      */
     forceLayout: true,
 
+    syncFields: true,
+
     initComponent: function() {
-
-        var filterPanel = this.addFilterPanel();
+        const filterPanel = this.addFilterPanel();
         this.filterModelMap = filterPanel.filterModelMap;
         this.activeFilterPanel = filterPanel;
 
@@ -119,12 +120,12 @@ Ext.extend(Tine.widgets.grid.FilterPanel, Ext.Panel, {
         }];
 
         Tine.widgets.grid.FilterPanel.superclass.initComponent.call(this);
-
+        
         if (this.useQuickFilter) {
             this.quickFilterPlugin = new Tine.widgets.grid.FilterToolbarQuickFilterPlugin(Ext.apply({
-                syncFields: false,
+                syncFields: this.syncFields,
             }, this.quickFilterConfig));
-            this.quickFilterPlugin.init(this);
+            this.quickFilterPlugin.init(filterPanel);
         }
     },
 
@@ -252,12 +253,12 @@ Ext.extend(Tine.widgets.grid.FilterPanel, Ext.Panel, {
     },
 
     getValue: function() {
-        var filters = [];
+        const filters = [];
 
-
-        for (var id in this.filterPanels) {
+        for (let id in this.filterPanels) {
             if (this.filterPanels.hasOwnProperty(id) && this.filterPanels[id].isActive) {
-                filters.push({'condition': 'AND', 'filters': this.filterPanels[id].getValue(), 'id': id, label: Ext.util.Format.htmlDecode(this.filterPanels[id].title)});
+                const filterData = this.filterPanels[id].getValue();
+                filters.push({'condition': 'AND', 'filters': filterData, 'id': id, label: Ext.util.Format.htmlDecode(this.filterPanels[id].title)});
             }
         }
 

diff --git a/tine20/Tinebase/js/widgets/grid/FilterToolbarQuickFilterPlugin.js b/tine20/Tinebase/js/widgets/grid/FilterToolbarQuickFilterPlugin.js
@@ -143,6 +143,7 @@ Tine.widgets.grid.FilterToolbarQuickFilterPlugin.prototype = {
      */
     init: function(ftb) {
         this.ftb = ftb;
+
         if (this.syncFields) {
             this.ftb.renderFilterRow = this.ftb.renderFilterRow.createSequence(this.onAddFilter, this);
             this.ftb.onFieldChange = this.ftb.onFieldChange.createSequence(this.onFieldChange, this);
@@ -348,7 +349,7 @@ Tine.widgets.grid.FilterToolbarQuickFilterPlugin.prototype = {
     },
 
     onGetValue: function() {
-        var value = this.origGetValue.call(this.ftb);
+        const value = this.origGetValue.call(this.ftb);
 
         if (! this.syncFields) {
             value.push({field: this.quickFilterField, operator: 'contains', value: this.quickFilter.getValue(), id: 'quickFilter'});
@@ -423,7 +424,7 @@ Tine.widgets.grid.FilterToolbarQuickFilterPlugin.prototype = {
      * @param {Ext.form.Field} field
      */
     syncField: function(field) {
-        if (field == this.quickFilter) {
+        if (field === this.quickFilter) {
             this.getQuickFilterRowField().formFields.value.setValue(this.quickFilter.getValue());
         } else {
             this.quickFilter.setValue(this.quickFilterRow.formFields.value.getValue());