Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ui filter bugfix

This commit is contained in:
hkernbach 2016-10-21 11:58:58 +02:00
parent fa12cb8ebd
commit d5ed52d4bb
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
js/apps/system/_admin/aardvark/APP/frontend/js/collections/arangoDocuments.js
View File

@ -68,27 +68,27 @@
if (this.filters.length === 0) { if (this.filters.length === 0) {
return ''; return '';
} }
var query = ' FILTER'; var query = ' FILTER ';
var res = '';
var parts = _.map(this.filters, function (f, i) { var parts = _.map(this.filters, function (f, i) {
if (f.op === 'LIKE') { var res = '';
res = ' ' + f.op + '(x.@attr, @param'; res += 'x.@attr ';
res += i;
res += ')';
} else {
res += ' x.@attr ';
res += f.op; res += f.op;
if (f.op === 'IN' || f.op === 'NOT IN') {
res += ' x.@param';
} else {
res += ' @param'; res += ' @param';
}
res += i; res += i;
if (f.op === 'LIKE') {
bindVars['param' + i] = '%' + f.val + '%';
} else if (f.op === 'IN' || f.op === 'NOT IN ') {
if (f.val.indexOf(',') !== -1) {
bindVars['param' + i] = f.val.split(',');
} else {
var arr = [];
bindVars['param' + i] = arr.push(f.val);
}
} else {
bindVars['param' + i] = f.val;
} }
bindVars['param' + i] = f.val;
if (f.attr.indexOf('.') !== -1) { if (f.attr.indexOf('.') !== -1) {
bindVars['attr'] = f.attr.split('.'); bindVars['attr'] = f.attr.split('.');
} else { } else {
@ -97,7 +97,7 @@
return res; return res;
}); });
return query + parts.join(' &&'); return query + parts.join(' && ');
}, },
setPagesize: function (size) { setPagesize: function (size) {