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

Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions

This commit is contained in:
Jan Steemann 2015-10-20 12:34:33 +02:00
parent 60283f13b9 84b32587f5
commit 1f8b5e54af
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG
View File

@ -103,6 +103,12 @@ v2.7.0-rc2 (2015-09-22)
v2.7.0-rc1 (2015-09-17)
-----------------------
* removed undocumented server-side-only collection functions:
* collection.OFFSET()
* collection.NTH()
* collection.NTH2()
* collection.NTH3()
* upgraded Swagger to version 2.0 for the Documentation
This gives the user better prepared test request structures.

4
js/apps/system/_admin/aardvark/APP/frontend/js/graphViewer/graph/gharialAdapter.js
View File

@ -106,7 +106,9 @@ function GharialAdapter(nodes, edges, viewer, config) {
direction = "outbound";
}
} else {
direction = "outbound";
// currently there is a bug with outbound-direction graphs.
// any should be default at the moment
direction = "any";
}
api.base = arangodb + "_api/";

5
js/apps/system/_admin/aardvark/APP/frontend/js/graphViewer/ui/gharialAdapterControls.js
View File

@ -54,11 +54,12 @@ function GharialAdapterControls(list, adapter) {
text: "Start with random vertex",
id: "random",
selected: true
},{
},//currently disabled outbound only view
/*{
type: "checkbox",
id: "undirected",
selected: (adapter.getDirection() === "any")
}], function () {
}*/], function () {
var graph = $("#" + idprefix + "graph")
.children("option")
.filter(":selected")

5
js/apps/system/_admin/aardvark/APP/frontend/js/graphViewer/ui/graphViewerUI.js
View File

@ -494,8 +494,10 @@ function GraphViewerUI(container, adapterConfig, optWidth, optHeight, viewerConf
//create select option box
var optionBox = '<li class="enabled" style="float:right">'+
'<select id="graphSize" class="documents-size">'+
'<optgroup label="Starting points:">'+
'<option value="5" selected="">5 vertices</option>'+
'<option value="10">10 vertices</option>'+
'<option value="20" selected="">20 vertices</option>'+
'<option value="20">20 vertices</option>'+
'<option value="50">50 vertices</option>'+
'<option value="100">100 vertices</option>'+
'<option value="500">500 vertices</option>'+
@ -504,6 +506,7 @@ function GraphViewerUI(container, adapterConfig, optWidth, optHeight, viewerConf
'<option value="5000">5000 vertices</option>'+
'<option value="all">All vertices</option>'+
'</select>'+
'</optgroup>'+
'</li>';
$('.headerBar .headerButtonList').prepend(optionBox);
},