File tree Expand file tree Collapse file tree 1 file changed +9
-5
lines changed
app/code/Magento/Ui/view/base/web/js/grid Expand file tree Collapse file tree 1 file changed +9
-5
lines changed Original file line number Diff line number Diff line change 5
5
6
6
define ( [
7
7
'uiComponent' ,
8
- 'underscore'
9
- ] , function ( Component , _ ) {
8
+ 'underscore' ,
9
+ 'jquery'
10
+ ] , function ( Component , _ , $ ) {
10
11
'use strict' ;
11
12
12
13
return Component . extend ( {
@@ -36,7 +37,9 @@ define([
36
37
* Apply filter
37
38
*/
38
39
apply : function ( ) {
39
- var urlFilter = this . getFilterParam ( this . searchString ) ;
40
+ var urlFilter = this . getFilterParam ( this . searchString ) ,
41
+ applied ,
42
+ filters = { } ;
40
43
41
44
if ( _ . isUndefined ( this . filterComponent ( ) ) ) {
42
45
setTimeout ( function ( ) {
@@ -47,8 +50,9 @@ define([
47
50
}
48
51
49
52
if ( Object . keys ( urlFilter ) . length ) {
50
- this . filterComponent ( ) . setData ( urlFilter , false ) ;
51
- this . filterComponent ( ) . apply ( ) ;
53
+ applied = this . filterComponent ( ) . get ( 'applied' ) ;
54
+ filters = $ . extend ( true , urlFilter , applied ) ;
55
+ this . filterComponent ( ) . set ( 'applied' , filters ) ;
52
56
}
53
57
} ,
54
58
You can’t perform that action at this time.
0 commit comments