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

fixed bug in commonPorperties, now attributes with the value of 'false' are included in result, fixed js shell to full general-graph support

This commit is contained in:
scottashton 2014-06-23 11:37:43 +02:00
parent c21c1d9a46
commit fa2084ea9b
6 changed files with 1347 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/Makefile.files
View File

@ -124,7 +124,7 @@ js/apps/system/aardvark/frontend/js/modules/%.js: @srcdir@/js/common/modules/%.j
js/apps/system/aardvark/frontend/js/modules/%.js: @srcdir@/js/client/modules/%.js .setup-js-directories
(echo "module.define(\"$(patsubst js/client/modules/%.js,%,$<)\", function(exports, module) {" && cat $< && echo "});") > $@
js/apps/system/aardvark/frontend/js/modules/underscore.js: @srcdir@/js/node/node_modules/underscore/underscore-min.js
js/apps/system/aardvark/frontend/js/modules/underscore.js: @srcdir@/js/node/node_modules/underscore/underscore.js
(echo "module.define(\"underscore\", function(exports, module) {" && cat $< && echo "});") > $@

1
js/apps/system/aardvark/frontend/js/modules/org/arangodb/general-graph.js
View File

@ -1657,7 +1657,6 @@ var _create = function (graphName, edgeDefinitions, orphanCollections) {
'edgeDefinitions' : edgeDefinitions,
'_key' : graphName
});
return new Graph(graphName, edgeDefinitions, collections[0], collections[1], orphanCollections);
};

1342
js/apps/system/aardvark/frontend/js/modules/underscore.js
View File

File diff suppressed because one or more lines are too long

1
js/apps/system/aardvark/manifest.json
View File

@ -94,6 +94,7 @@
"frontend/js/arango/templateEngine.js",
"frontend/js/shell/browser.js",
"frontend/js/config/dygraphConfig.js",
"frontend/js/modules/underscore.js",
"frontend/js/modules/org/arangodb/**",
"frontend/js/modules/org/arangodb-common.js",
"frontend/js/modules/org/arangodb.js",

5
js/common/modules/org/arangodb/general-graph.js
View File

@ -1656,7 +1656,7 @@ var _create = function (graphName, edgeDefinitions, orphanCollections) {
'edgeDefinitions' : edgeDefinitions,
'_key' : graphName
});
require("internal").print("precreate");
return new Graph(graphName, edgeDefinitions, collections[0], collections[1], orphanCollections);
};
@ -1782,6 +1782,7 @@ var bindEdgeCollections = function(self, edgeCollections) {
var bindVertexCollections = function(self, vertexCollections) {
_.each(vertexCollections, function(key) {
require("internal").print("each resolved");
var obj = db._collection(key);
var result;
var wrap = wrapCollection(obj);
@ -1875,6 +1876,7 @@ var updateBindCollections = function(graph) {
bindVertexCollections(graph, edgeDef.to);
}
);
require("internal").print("preVertex");
bindVertexCollections(graph, graph.__orphanCollections);
};
@ -2089,6 +2091,7 @@ var Graph = function(graphName, edgeDefinitions, vertexCollections, edgeCollecti
createHiddenProperty(this, "__idsToRemove", []);
createHiddenProperty(this, "__collectionsToLock", []);
createHiddenProperty(this, "__orphanCollections", orphanCollections);
require("internal").print("preBind");
updateBindCollections(self);
};

2
js/server/modules/org/arangodb/ahuacatl.js
View File

@ -6204,7 +6204,7 @@ function GENERAL_GRAPH_COMMON_PROPERTIES (
tmp[f._id + "|keys"].push(t._id);
var obj = {_id : t._id};
Object.keys(f).forEach(function (fromDoc) {
if (t[fromDoc] && t[fromDoc] === f[fromDoc]) {
if (t[fromDoc] !== undefined && t[fromDoc] === f[fromDoc]) {
obj[fromDoc] = t[fromDoc];
}
});