From 33a76762d69b7bca4cb61b23f983438b27d605a0 Mon Sep 17 00:00:00 2001 From: hkernbach Date: Mon, 8 Feb 2016 20:30:47 +0100 Subject: [PATCH] front-end: added NOT IN filter, issue: #1657 --- .../APP/frontend/js/collections/arangoDocuments.js | 12 ++++++------ .../APP/frontend/js/templates/documentsView.ejs | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/collections/arangoDocuments.js b/js/apps/system/_admin/aardvark/APP/frontend/js/collections/arangoDocuments.js index 548160ce7c..42400c4aa6 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/collections/arangoDocuments.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/collections/arangoDocuments.js @@ -64,21 +64,21 @@ } var query = " FILTER", res = '', parts = _.map(this.filters, function(f, i) { - if (f.op === 'IN') { + if (f.op === 'IN' || f.op === 'NOT IN') { res = ' '; } else { res = " x.`"; } res += f.attr; - if (f.op !== 'IN') { - res += "` "; - } - else { + if (f.op === 'IN' || f.op === 'NOT IN') { res += " "; } + else { + res += "` "; + } res += f.op; - if (f.op === 'IN') { + if (f.op === 'IN' || f.op === 'NOT IN') { res += " x.@param"; } else { diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/templates/documentsView.ejs b/js/apps/system/_admin/aardvark/APP/frontend/js/templates/documentsView.ejs index b7643519fd..d20b667390 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/templates/documentsView.ejs +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/templates/documentsView.ejs @@ -71,6 +71,7 @@ +