From 0d0f8eadbbd806e0b9ef4ea8d2f1bd8cd0aacab2 Mon Sep 17 00:00:00 2001 From: Heiko Date: Wed, 6 Dec 2017 10:54:44 +0100 Subject: [PATCH] edge collections were wrongly added to from and to vertices select box during graph creation - devel (#3881) --- CHANGELOG | 2 ++ .../APP/frontend/js/templates/edgeDefinitionTable.ejs | 2 +- .../APP/frontend/js/views/graphManagementView.js | 9 ++++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index f841cce9ec..f9df93445a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ devel ----- +* UI: edge collections were wrongly added to from and to vertices select box during graph creation + * fixed issue #3640: limit in subquery * UI: the graph viewer now displays updated label values correctly. diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/templates/edgeDefinitionTable.ejs b/js/apps/system/_admin/aardvark/APP/frontend/js/templates/edgeDefinitionTable.ejs index d112c511da..98c4bb4f2b 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/templates/edgeDefinitionTable.ejs +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/templates/edgeDefinitionTable.ejs @@ -5,7 +5,7 @@ - + diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/graphManagementView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/graphManagementView.js index 613baff6e5..bd97c54367 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/graphManagementView.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/graphManagementView.js @@ -1041,10 +1041,11 @@ var collList = []; var collections = this.options.collectionCollection.models; collections.forEach(function (c) { - if (c.get('isSystem')) { - return; + if (!c.get('isSystem')) { + if (c.get('type') !== 'edge') { + collList.push(c.id); + } } - collList.push(c.id); }); e.stopPropagation(); var id = $(e.currentTarget).attr('id'); var number; @@ -1079,6 +1080,8 @@ window.modalView.undelegateEvents(); window.modalView.delegateEvents(this.events); + arangoHelper.fixTooltips('.icon_arangodb, .arangoicon', 'right'); + var i; $('.modal-body .spacer').remove(); for (i = 0; i <= this.counter; i++) {