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

front-end: added NOT IN filter, issue: #1657

This commit is contained in:
hkernbach 2016-02-08 20:30:47 +01:00
parent 82fa26c79e
commit 33a76762d6
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,21 +64,21 @@
} }
var query = " FILTER", res = '', var query = " FILTER", res = '',
parts = _.map(this.filters, function(f, i) { parts = _.map(this.filters, function(f, i) {
if (f.op === 'IN') { if (f.op === 'IN' || f.op === 'NOT IN') {
res = ' '; res = ' ';
} }
else { else {
res = " x.`"; res = " x.`";
} }
res += f.attr; res += f.attr;
if (f.op !== 'IN') { if (f.op === 'IN' || f.op === 'NOT IN') {
res += "` ";
}
else {
res += " "; res += " ";
} }
else {
res += "` ";
}
res += f.op; res += f.op;
if (f.op === 'IN') { if (f.op === 'IN' || f.op === 'NOT IN') {
res += " x.@param"; res += " x.@param";
} }
else { else {

1
js/apps/system/_admin/aardvark/APP/frontend/js/templates/documentsView.ejs
View File

@ -71,6 +71,7 @@
<option value="&gt;">&gt;</option> <option value="&gt;">&gt;</option>
<option value="&gt;=">&gt;=</option> <option value="&gt;=">&gt;=</option>
<option value="IN">IN</option> <option value="IN">IN</option>
<option value="NOT IN">NOT IN</option>
</select><input id="attribute_value0" type="text" placeholder="Attribute value" class="filterValue"> </select><input id="attribute_value0" type="text" placeholder="Attribute value" class="filterValue">
<a id="addFilterItem" class="add-filter-item"><i class="icon-plus arangoicon"></i></a> <a id="addFilterItem" class="add-filter-item"><i class="icon-plus arangoicon"></i></a>
<button id="resetView" class="button-warning btn-old-padding">Reset</button> <button id="resetView" class="button-warning btn-old-padding">Reset</button>