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

fixed a document filter state bug

This commit is contained in:
Heiko Kernbach 2014-08-20 10:52:18 +02:00
parent ed1942c8d0
commit 727d8a3f17
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
js/apps/system/aardvark/frontend/js/views/documentsView.js
View File

@ -222,7 +222,7 @@
filterCollection : function () { filterCollection : function () {
$('#indexCollection').removeClass('activated'); $('#indexCollection').removeClass('activated');
$('#importCollection').removeClass('activated'); $('#importCollection').removeClass('activated');
$('#markDocuments').removeClass('activated'); this.changeEditMode(); $('#markDocuments').removeClass('activated'); this.changeEditMode(false);
$('#filterCollection').toggleClass('activated'); $('#filterCollection').toggleClass('activated');
this.activeFilter = true; this.activeFilter = true;
$('#filterHeader').slideToggle(200); $('#filterHeader').slideToggle(200);
@ -242,7 +242,7 @@
importCollection: function () { importCollection: function () {
$('#filterCollection').removeClass('activated'); $('#filterCollection').removeClass('activated');
$('#indexCollection').removeClass('activated'); $('#indexCollection').removeClass('activated');
$('#markDocuments').removeClass('activated'); this.changeEditMode(); $('#markDocuments').removeClass('activated'); this.changeEditMode(false);
$('#importCollection').toggleClass('activated'); $('#importCollection').toggleClass('activated');
$('#importHeader').slideToggle(200); $('#importHeader').slideToggle(200);
$('#filterHeader').hide(); $('#filterHeader').hide();
@ -253,7 +253,7 @@
indexCollection: function () { indexCollection: function () {
$('#filterCollection').removeClass('activated'); $('#filterCollection').removeClass('activated');
$('#importCollection').removeClass('activated'); $('#importCollection').removeClass('activated');
$('#markDocuments').removeClass('activated'); this.changeEditMode(); $('#markDocuments').removeClass('activated'); this.changeEditMode(false);
$('#indexCollection').toggleClass('activated'); $('#indexCollection').toggleClass('activated');
$('#newIndexView').hide(); $('#newIndexView').hide();
$('#indexEditView').show(); $('#indexEditView').show();
@ -263,8 +263,8 @@
$('#filterHeader').hide(); $('#filterHeader').hide();
}, },
changeEditMode: function () { changeEditMode: function (enable) {
if (this.editMode === true) { if (enable === false || this.editMode === true) {
$('#documentsTableID tr').css('cursor', 'default'); $('#documentsTableID tr').css('cursor', 'default');
$('.deleteButton').fadeIn(); $('.deleteButton').fadeIn();
$('.addButton').fadeIn(); $('.addButton').fadeIn();
@ -324,16 +324,12 @@
restoreFilter: function () { restoreFilter: function () {
var self = this, counter = 0; var self = this, counter = 0;
this.filterId = 0;
_.each(this.restoredFilters, function (f) { _.each(this.restoredFilters, function (f) {
//change html here and restore filters //change html here and restore filters
if (counter !== 0) { if (counter !== 0) {
self.addFilterItem(); self.addFilterItem();
} }
if (counter === 1) {
counter = 2;
}
if (f.operator !== undefined) { if (f.operator !== undefined) {
$('#attribute_name' + counter).val(f.attribute); $('#attribute_name' + counter).val(f.attribute);
$('#operator' + counter).val(f.operator); $('#operator' + counter).val(f.operator);