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

remove + from multiple search terms, fix boolean error

This commit is contained in:
Annika Wolff 2020-07-15 08:04:14 +02:00
parent a833677ffa
commit 7ca4deba90
3 changed files with 12 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=e5e928de0a10dc274cd5",
"/js/ui.js": "/js/ui.js?id=bc86c308c43497721d8d",
"/css/ui.css": "/css/ui.css?id=7a610c96759844d71103"
}

13
packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php
View File

@ -620,7 +620,11 @@
for (let i = 0; i < moreSplitted.length; i++) {
const key = decodeURI(moreSplitted[i][0]);
const value = decodeURI(moreSplitted[i][1]);
let value = decodeURI(moreSplitted[i][1]);
if (value.includes('+')) {
value = value.replace('+', ' ');
}
obj.column = key.replace(']', '').split('[')[0];
obj.cond = key.replace(']', '').split('[')[1]
@ -632,7 +636,9 @@
break;
case "channel":
obj.label = "Channel";
console.log(obj.column, obj.label, obj.cond, obj.val);
break;
case "locale":
obj.label = "Locale";
break;
case "customer_group":
obj.label = "Customer Group";
@ -651,7 +657,8 @@
obj.label = this.columns[colIndex].label;
if (this.columns[colIndex].type === 'boolean') {
if (obj.val === 1) {
console.log('obj.val',obj.val);
if (obj.val === '1') {
obj.val = '{{ __('ui::app.datagrid.true') }}';
} else {
obj.val = '{{ __('ui::app.datagrid.false') }}';