Fixed grids init search (#634)

* Fixed grids init search * Cleanup
yakworks · Nov 16, 2021 · ac885f0 · ac885f0
1 parent cd4ac03
commit ac885f0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/gridz/GridCtrl.js b/src/gridz/GridCtrl.js
@@ -419,7 +419,8 @@ export default class GridCtrl {
       // to be able to set default filters on the first load
       const q = p.q ? JSON.parse(p.q): {}
       const permanentFilters = this.listCtrl?.permanentFilters || {}
-      p.q = JSON.stringify({ ...q, ...searchModel , ...permanentFilters})
+      const initSearch = this.listCtrl?.initSearch || {}
+      p.q = JSON.stringify({...initSearch, ...q,  ...searchModel, ...permanentFilters})
       const data = await this.dataApi.search(p)
       this.addJSONData(data)
     } catch (er) {

diff --git a/src/ng/gridz/list/BaseListCtrl.js b/src/ng/gridz/list/BaseListCtrl.js
@@ -34,7 +34,7 @@ export default class BaseListCtrl {
   }
 
   extendFilters(filters) {
-    return _.merge({}, filters || {}, this.permanentFilters)
+    return _.merge(this.initSearch || {}, filters || {}, this.permanentFilters)
   }
 
   async doConfig(cfg) {