From 4acd777b6c4494cc7f36bf9f137053e1c42f2715 Mon Sep 17 00:00:00 2001 From: Jan Steemann Date: Thu, 14 Feb 2013 11:40:14 +0100 Subject: [PATCH 1/3] fixed jslint warnings --- js/client/client.js | 2 +- js/common/bootstrap/module-internal.js | 4 ++-- js/server/modules/org/arangodb/ahuacatl.js | 10 ++++++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/js/client/client.js b/js/client/client.js index c834839934..755063abb1 100755 --- a/js/client/client.js +++ b/js/client/client.js @@ -104,7 +104,7 @@ function clear () { if (internal.ARANGO_QUIET !== true) { if (typeof internal.arango !== "undefined") { if (typeof internal.arango.isConnected !== "undefined") { - if (internal.arango.isConnected() && typeof SYS_UNIT_TESTS == "undefined") { + if (internal.arango.isConnected() && typeof SYS_UNIT_TESTS === "undefined") { internal.print(arangosh.HELP); } } diff --git a/js/common/bootstrap/module-internal.js b/js/common/bootstrap/module-internal.js index 00bcae9954..e3e549b474 100644 --- a/js/common/bootstrap/module-internal.js +++ b/js/common/bootstrap/module-internal.js @@ -733,7 +733,7 @@ internal.startCaptureMode = function () { internal.outputBuffer = ""; internal.output = internal.bufferOutput; - } + }; //////////////////////////////////////////////////////////////////////////////// /// @brief stop capture mode @@ -746,7 +746,7 @@ internal.output = internal.stdOutput; return buffer; - } + }; //////////////////////////////////////////////////////////////////////////////// /// @brief start color printing diff --git a/js/server/modules/org/arangodb/ahuacatl.js b/js/server/modules/org/arangodb/ahuacatl.js index 3a87e163d4..c89a8126e9 100644 --- a/js/server/modules/org/arangodb/ahuacatl.js +++ b/js/server/modules/org/arangodb/ahuacatl.js @@ -2864,21 +2864,23 @@ function GRAPH_TRAVERSAL_TREE (vertexCollection, function GRAPH_EDGES (edgeCollection, vertex, direction) { - var c = COLLECTION(edgeCollection); + var c = COLLECTION(edgeCollection), result; // validate arguments if (direction === "outbound") { - return c.outEdges(vertex); + result = c.outEdges(vertex); } else if (direction === "inbound") { - return c.inEdges(vertex); + result = c.inEdges(vertex); } else if (direction === "any") { - return c.edges(vertex); + result = c.edges(vertex); } else { THROW(INTERNAL.errors.ERROR_QUERY_FUNCTION_ARGUMENT_TYPE_MISMATCH, "EDGES"); } + + return result; } //////////////////////////////////////////////////////////////////////////////// From ee73fce4dc4a45a5dc09d9c673a53e7af8019b00 Mon Sep 17 00:00:00 2001 From: Jan Steemann Date: Thu, 14 Feb 2013 14:36:23 +0100 Subject: [PATCH 2/3] partly reverted #400 --- CONTRIBUTING.md | 3 +-- README | 6 +----- README.md | 6 +----- html/admin/index.html | 2 +- html/admin/media/icons/uservoice.png | Bin 2490 -> 0 bytes 5 files changed, 4 insertions(+), 13 deletions(-) delete mode 100644 html/admin/media/icons/uservoice.png diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c098617470..3fe83782c9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -8,8 +8,8 @@ Please follow these guidelines if you want to contribute to ArangoDB: * Please make sure you have a GitHub account * Please look into the ArangoDB issue tracker on GitHub for similar/identical issues * For bugs: if the bug you found is not yet described in an existing issue, please file a new one. The new issue should include a clear description of the bug and how to reproduce it (including your environment) +* For feature requests: please clearly describe the proposed feature, additional configuration options, and side effects * Please let us know if you plan to work an a ticket. This way we can make sure we avoid redundant work -* For feature requests: feature requests should be directed to our feature request & voting system at arangodb.uservoice.com * Create a fork our repository. You can use GitHub to do this * Clone the fork to your development box and pull the latest changes from the ArangoDB repository. Please make sure to use the appropriate branch: @@ -41,6 +41,5 @@ This will help us reproducing and finding bugs. * [ArangoDB website](https://www.arangodb.org/) * [ArangoDB on Twitter](https://twitter.com/arangodb) -* [ArangoDB feature requests](https://uservoice.arangodb.com) * [General GitHub documentation](https://help.github.com/) * [GitHub pull request documentation](https://help.github.com/send-pull-requests/) diff --git a/README b/README index 4bd84bec7a..0c25ff101b 100644 --- a/README +++ b/README @@ -84,11 +84,7 @@ them: https://github.com/triAGENS/ArangoDB/issues -You can use the Google group for questions concerning ArangoDB: +You can use the Google group for improvements, feature requests, comments http://www.arangodb.org/connect -For feature requests, please use our feature request tracking & voting system at: - - http://arangodb.uservoice.com - diff --git a/README.md b/README.md index 6cf5de4e4a..206d174c6b 100644 --- a/README.md +++ b/README.md @@ -85,11 +85,7 @@ you report them: https://github.com/triAGENS/ArangoDB/issues -You can use the Google group for questions concerning ArangoDB: +You can use the Google group for improvements, feature requests, comments http://www.arangodb.org/connect -For feature requests, please use our feature request tracking & voting system at: - - http://arangodb.uservoice.com - diff --git a/html/admin/index.html b/html/admin/index.html index aed008ed41..6aa05c9576 100644 --- a/html/admin/index.html +++ b/html/admin/index.html @@ -513,7 +513,7 @@ diff --git a/html/admin/media/icons/uservoice.png b/html/admin/media/icons/uservoice.png deleted file mode 100644 index 3f529e5f2d926663441d2acc029ff6f1f1b34713..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2490 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 Ef)VDX`Tzg` From 46c5d66f8e7dadf6d881f50b8f46f28873ca5958 Mon Sep 17 00:00:00 2001 From: a-brandt Date: Thu, 14 Feb 2013 15:12:11 +0100 Subject: [PATCH 3/3] bugfix #396: Creating a Graph with an existing graph's name _key doesn't throw an error --- UnitTests/HttpInterface/api-graph-spec.rb | 2 +- js/server/modules/org/arangodb/graph.js | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/UnitTests/HttpInterface/api-graph-spec.rb b/UnitTests/HttpInterface/api-graph-spec.rb index 75d49f8b8f..05032f47b9 100644 --- a/UnitTests/HttpInterface/api-graph-spec.rb +++ b/UnitTests/HttpInterface/api-graph-spec.rb @@ -136,7 +136,7 @@ describe ArangoDB do doc1.code.should eq(201) doc2 = create_graph( prefix, "recreate", vertex_collection, edge_collection ) - doc2.code.should eq(201) + doc2.code.should eq(400) end it "checks (re)create graph different name" do diff --git a/js/server/modules/org/arangodb/graph.js b/js/server/modules/org/arangodb/graph.js index 035d9a37a4..d4edda6408 100644 --- a/js/server/modules/org/arangodb/graph.js +++ b/js/server/modules/org/arangodb/graph.js @@ -585,13 +585,14 @@ function Graph (name, vertices, edges) { } } else { - if (graphProperties.vertices !== vertices.name()) { - throw "found graph but has different "; - } + throw "graph with that name already exists"; + //if (graphProperties.vertices !== vertices.name()) { + // throw "found graph but has different "; + //} - if (graphProperties.edges !== edges.name()) { - throw "found graph but has different "; - } + //if (graphProperties.edges !== edges.name()) { + // throw "found graph but has different "; + //} } }