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

Bug fix/internal issue 2785 (#6802)

This commit is contained in:
Heiko 2018-10-11 10:43:04 +02:00 committed by Jan
parent c93b359043
commit 16af0901f1
5 changed files with 51 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@ -1,6 +1,9 @@
devel
-----
* fix internal issue #2785: web ui's sort dialog sometimes got rendered, even
if it should not.
* fix internal issue #2764: the waitForSync property of a satellite collection
could not be changed via the Web UI

4
js/apps/system/_admin/aardvark/APP/frontend/js/arango/arango.js
View File

@ -176,14 +176,18 @@
if (!$(element).hasClass('nav-header')) {
if ($(element).find('input').attr('checked')) {
if ($(element).find('i').hasClass('css-round-label')) {
$(element).find('i').removeClass('fa-circle-o');
$(element).find('i').addClass('fa-dot-circle-o');
} else {
$(element).find('i').removeClass('fa-square-o');
$(element).find('i').addClass('fa-check-square-o');
}
} else {
if ($(element).find('i').hasClass('css-round-label')) {
$(element).find('i').removeClass('fa-dot-circle-o');
$(element).find('i').addClass('fa-circle-o');
} else {
$(element).find('i').removeClass('fa-check-square-o');
$(element).find('i').addClass('fa-square-o');
}
}

23
js/apps/system/_admin/aardvark/APP/frontend/js/views/databaseView.js
View File

@ -37,12 +37,7 @@
this.collection.setSortingDesc(false);
}
if ($('#databaseDropdown').is(':visible')) {
this.dropdownVisible = true;
} else {
this.dropdownVisible = false;
}
this.checkVisibility();
this.render();
},
@ -97,7 +92,7 @@
if (self.dropdownVisible === true) {
$('#dbSortDesc').attr('checked', self.collection.sortOptions.desc);
$('#databaseToggle').toggleClass('activated');
$('#databaseToggle').addClass('activated');
$('#databaseDropdown2').show();
}
@ -114,12 +109,24 @@
return this;
},
checkVisibility: function () {
if ($('#databaseDropdown').is(':visible')) {
this.dropdownVisible = true;
} else {
this.dropdownVisible = false;
}
arangoHelper.setCheckboxStatus('#databaseDropdown');
},
toggleSettingsDropdown: function () {
var self = this;
// apply sorting to checkboxes
$('#dbSortDesc').attr('checked', this.collection.sortOptions.desc);
$('#databaseToggle').toggleClass('activated');
$('#databaseDropdown2').slideToggle(200);
$('#databaseDropdown2').slideToggle(200, function () {
self.checkVisibility();
});
},
selectedDatabase: function () {

21
js/apps/system/_admin/aardvark/APP/frontend/js/views/graphManagementView.js
View File

@ -184,12 +184,24 @@
$('#' + clicked).click();
},
checkVisibility: function () {
if ($('#graphManagementDropdown').is(':visible')) {
this.dropdownVisible = true;
} else {
this.dropdownVisible = false;
}
arangoHelper.setCheckboxStatus('#graphManagementDropdown');
},
toggleGraphDropdown: function () {
var self = this;
// apply sorting to checkboxes
$('#graphSortDesc').attr('checked', this.collection.sortOptions.desc);
$('#graphManagementToggle').toggleClass('activated');
$('#graphManagementDropdown2').slideToggle(200);
$('#graphManagementDropdown2').slideToggle(200, function () {
self.checkVisibility();
});
},
sorting: function () {
@ -199,12 +211,7 @@
this.collection.setSortingDesc(false);
}
if ($('#graphManagementDropdown').is(':visible')) {
this.dropdownVisible = true;
} else {
this.dropdownVisible = false;
}
this.checkVisibility();
this.render();
},

23
js/apps/system/_admin/aardvark/APP/frontend/js/views/viewsView.js
View File

@ -36,6 +36,15 @@
'click #viewsSortDesc': 'sorting'
},
checkVisibility: function () {
if ($('#viewsDropdown').is(':visible')) {
this.dropdownVisible = true;
} else {
this.dropdownVisible = false;
}
arangoHelper.setCheckboxStatus('#viewsDropdown');
},
sorting: function () {
if ($('#viewsSortDesc').is(':checked')) {
this.setSortingDesc(true);
@ -43,12 +52,7 @@
this.setSortingDesc(false);
}
if ($('#viewsDropdown').is(':visible')) {
this.dropdownVisible = true;
} else {
this.dropdownVisible = false;
}
this.checkVisibility();
this.render();
},
@ -62,11 +66,14 @@
},
toggleSettingsDropdown: function () {
var self = this;
// apply sorting to checkboxes
$('#viewsSortDesc').attr('checked', this.sortOptions.desc);
$('#viewsToggle').toggleClass('activated');
$('#viewsDropdown2').slideToggle(200);
$('#viewsDropdown2').slideToggle(200, function () {
self.checkVisibility();
});
},
render: function (data) {
@ -87,7 +94,7 @@
if (self.dropdownVisible === true) {
$('#viewsSortDesc').attr('checked', self.sortOptions.desc);
$('#viewsToggle').toggleClass('activated');
$('#viewsToggle').addClass('activated');
$('#viewsDropdown2').show();
}