mirror of https://gitee.com/bigwinds/arangodb
edge collections were wrongly added to from and to vertices select box during graph creation - devel (#3881)
This commit is contained in:
parent
6614731b50
commit
0d0f8eadbb
|
@ -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.
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
<input type="hidden" id="newEdgeDefinitions<%= number%>" value="" placeholder="Edge definitions" tabindex="-1" class="select2-offscreen">
|
||||
<button id="remove_newEdgeDefinitions<%= number%>" class="graphViewer-icon-button gv_internal_remove_line gv-icon-small delete"></button>
|
||||
</th><th>
|
||||
<span class="modalTooltips arangoicon icon_arangodb_info" title="Some info for edge definitions">
|
||||
<span class="modalTooltips arangoicon icon_arangodb_info" title="An edge definition defines a relation of the graph">
|
||||
</span>
|
||||
</th>
|
||||
</tr>
|
||||
|
|
|
@ -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++) {
|
||||
|
|
Loading…
Reference in New Issue