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

Merge pull request #6641 from papnoisanjeev/alert-box-issue-during-filter 

Alert box issue during filtering #6640
This commit is contained in:
Jitendra Singh 2022-08-24 14:28:08 +05:30 committed by GitHub
parent b0e4d0dc97 7c754c9924
commit 2907817d21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 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=843e70b28b60736c0103",
"/js/ui.js": "/js/ui.js?id=2effb6ad469c2b8c5af2",
"/css/ui.css": "/css/ui.css?id=933372010d246f94f931"
}

8
packages/Webkul/Ui/src/Resources/assets/js/components/datagrid/filters/column-filter.vue
View File

@ -395,7 +395,7 @@ export default {
number: {
isSelected: false,
condition: null,
value: 0
value: null
},
boolean: {
@ -540,6 +540,10 @@ export default {
case 'number': {
let indexConditions = true;
if (! this.types.number.value) {
this.switchSelectCondition('number');
}
if (
this.filterIndex === this.columnOrAlias &&
(this.types.number.value === 0 ||
@ -548,8 +552,6 @@ export default {
indexConditions = false;
alert(this.translations.zeroIndex);
} else {
alert(this.translations.emptyValue);
}
if (indexConditions) {