merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6097 from devansh-webkul/datagrid-issue 

Datagrid Filter Persistence Issue
This commit is contained in:
Jitendra Singh 2022-03-17 13:49:28 +05:30 committed by GitHub
parent 07bb5c11d9 7b9cf5f197
commit abd1098ab0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Ui/publishable/assets/js/ui.js vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Ui/publishable/assets/mix-manifest.json
View File

@ -1,4 +1,4 @@
{
"/js/ui.js": "/js/ui.js?id=7f7536c1762935de2278",
"/js/ui.js": "/js/ui.js?id=b3cbdf5567c0a5800de1",
"/css/ui.css": "/css/ui.css?id=bd09631c82c50b02445f"
}

9
packages/Webkul/Ui/src/Resources/assets/js/components/datagrid/datagrid-plus.vue
View File

@ -620,7 +620,7 @@
type="checkbox"
v-model="allSelected"
v-on:change="selectAll"
:disabled="! records.data.length"
:disabled="!records.data.length"
/>
<label
@ -877,9 +877,13 @@ export default {
let datagridInfo = this.getCurrentDatagridInfo();
if (datagridInfo) {
this.filterCurrentDatagridFromDatagridsInfo();
/**
* Will check this later. Don't remove it.
*/
// this.filterCurrentDatagridFromDatagridsInfo();
this.url = datagridInfo.previousUrl;
this.filters = datagridInfo.previousFilters;
}
} else {
let datagridsInfo = this.getDatagridsInfo();
@ -925,6 +929,7 @@ export default {
getDatagridsInfoDefaults: function() {
return {
id: this.id,
previousFilters: this.filters,
previousUrl: this.url
};
},