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 data-modification

This commit is contained in:
Jan Steemann 2015-03-25 12:43:44 +01:00
parent 2f58e4ea61 c7f9679085
commit f49eae6dd5
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/server/modules/org/arangodb/aql.js
View File

@ -5840,11 +5840,11 @@ function CALCULATE_SHORTEST_PATHES_WITH_DIJKSTRA (graphName, options) {
params.visitor = TRAVERSAL_DIJSKTRA_VISITOR; params.visitor = TRAVERSAL_DIJSKTRA_VISITOR;
} }
// merge other options // merge other options
for (var att in options) { Object.keys(options).forEach(function (att) {
if (! params.hasOwnProperty(att)) { if (! params.hasOwnProperty(att)) {
params[att] = options[att]; params[att] = options[att];
} }
} });
var result = [], fromVertices = RESOLVE_GRAPH_TO_FROM_VERTICES(graphName, options), var result = [], fromVertices = RESOLVE_GRAPH_TO_FROM_VERTICES(graphName, options),
toVertices = RESOLVE_GRAPH_TO_TO_VERTICES(graphName, options, "GRAPH_SHORTEST_PATH"); toVertices = RESOLVE_GRAPH_TO_TO_VERTICES(graphName, options, "GRAPH_SHORTEST_PATH");
@ -6527,11 +6527,11 @@ function AQL_GRAPH_NEIGHBORS (graphName,
params.filterVertexCollections = options.endVertexCollectionRestriction; params.filterVertexCollections = options.endVertexCollectionRestriction;
} }
// merge other options // merge other options
for (var att in options) { Object.keys(options).forEach(function (att) {
if (! params.hasOwnProperty(att)) { if (! params.hasOwnProperty(att)) {
params[att] = options[att]; params[att] = options[att];
} }
} });
fromVertices.forEach(function (v) { fromVertices.forEach(function (v) {
var e = TRAVERSAL_FUNC("GRAPH_NEIGHBORS", var e = TRAVERSAL_FUNC("GRAPH_NEIGHBORS",
factory, factory,

2
js/server/modules/org/arangodb/foxx/templateEngine.js
View File

@ -1,7 +1,7 @@
/*global require, module, exports*/ /*global require, module, exports*/
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief Foxx tempalte engine /// @brief Foxx template engine
/// ///
/// @file /// @file
/// ///

2
js/server/modules/org/arangodb/foxx/template_middleware.js
View File

@ -92,7 +92,7 @@ TemplateMiddleware = function (templateCollection, helper) {
throw new Error("Unknown template language '" + template.templateLanguage + "'"); throw new Error("Unknown template language '" + template.templateLanguage + "'");
} }
this.body = _.template(template.content, _.extend(data, helper)); this.body = _.template(template.content)(_.extend(data, helper));
this.contentType = template.contentType; this.contentType = template.contentType;
} }
}; };