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

Merge branch 'JHMH' of github.com:arangodb/arangodb into JHMH

This commit is contained in:
Michael Hackstein 2015-11-27 16:25:38 +01:00
parent a7b7d1ec18 ac8542fe07
commit 6229d03eb9
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -680,7 +680,11 @@
} }
$('#graphTab').hide(); $('#graphTab').hide();
$('#modal-dialog .modal-delete-confirmation').append('<fieldset><input type="checkbox" id="dropGraphCollections" name="" value=""><label for="mc">also drop collections?</label></fieldset>'); $('#modal-dialog .modal-delete-confirmation').append(
'<fieldset><input type="checkbox" id="dropGraphCollections" name="" value="">' +
'<label for="mc">also drop collections?</label>' +
'</fieldset>'
);
} }
}, },

29
js/common/modules/org/arangodb/graph-examples/example-graph.js
View File

@ -978,13 +978,27 @@ var createMoviesGraph = function (prefixed) {
var knownGraphs = { var knownGraphs = {
"knows_graph" : {create: createTraversalExample, dependencies: ["knows", "persons"]}, "knows_graph" : {create: createTraversalExample, dependencies: [
"routeplanner" : {create: createRoutePlannerGraph, dependencies: ["frenchHighway", "frenchCity", "germanCity", "germanHighway", "internationalHighway"]}, "knows", "persons"
"social" : {create: createSocialGraph, dependencies: ["relation", "female", "male"]}, ]},
"worldCountry" : {create: createWorldCountryGraph, dependencies: ["worldVertices", "worldEdges"]}, "routeplanner" : {create: createRoutePlannerGraph, dependencies: [
"worldCountryUnManaged" : {create: createWorldCountryGraphUnManaged, dependencies: ["worldVertices", "worldEdges"]}, "frenchHighway", "frenchCity", "germanCity", "germanHighway", "internationalHighway"
"traversalGraph" : {create: createTraversalGraph, dependencies: ["edges", "circles"]}, ]},
"movies" : {create: createMoviesGraph, dependencies: ["Person", "Movie", "ACTED_IN" ,"DIRECTED", "PRODUCED", "WROTE", "REVIEWED", "FOLLOWS"]} "social" : {create: createSocialGraph, dependencies: [
"relation", "female", "male"
]},
"worldCountry" : {create: createWorldCountryGraph, dependencies: [
"worldVertices", "worldEdges"
]},
"worldCountryUnManaged" : {create: createWorldCountryGraphUnManaged, dependencies: [
"worldVertices", "worldEdges"
]},
"traversalGraph" : {create: createTraversalGraph, dependencies: [
"edges", "circles"
]},
"movies" : {create: createMoviesGraph, dependencies: [
"Person", "Movie", "ACTED_IN" ,"DIRECTED", "PRODUCED", "WROTE", "REVIEWED", "FOLLOWS"
]}
}; };
var unManagedGraphs = { var unManagedGraphs = {
@ -1042,7 +1056,6 @@ var loadGraph = function (name, prefixed) {
err.errorMessage = "the collection: " + JSON.stringify(dependencies) + " already exists. Please clean up and try again."; err.errorMessage = "the collection: " + JSON.stringify(dependencies) + " already exists. Please clean up and try again.";
} }
throw err; throw err;
return false;
} }
} }