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

Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel

This commit is contained in:
Frank Celler 2014-03-12 18:19:54 +01:00
parent 56eb394f04 0dfac28f71
commit f44f55b280
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG
View File

@ -4,6 +4,13 @@ v2.1.0 (XXXX-XX-XX)
* removed arangod command line option `--database.remove-on-compacted`
v2.0.1 (XXXX-XX-XX)
-------------------
* when creating a collection via the web interface, the collection type was always
"document", regardless of the user's choice
v2.0.0 (2014-03-10)
-------------------

2
js/actions/api-collection.js
View File

@ -316,7 +316,7 @@ function post_api_collection (req, res) {
try {
var collection;
if (typeof(r.type) === "string") {
if (r.type.toLowerCase() === "edge") {
if (r.type.toLowerCase() === "edge" || r.type === "3") {
r.type = arangodb.ArangoCollection.TYPE_EDGE;
}
}

2
js/apps/system/aardvark/frontend/js/collections/arangoCollections.js
View File

@ -272,7 +272,7 @@
data.name = collName;
data.waitForSync = wfs;
data.isSystem = isSystem;
data.type = collType;
data.type = parseInt(collType, 10);
if (shards) {
data.numberOfShards = shards;
data.shardKeys = keys;

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

@ -1,4 +1,4 @@
/*jslint indent: 2, nomen: true, maxlen: 100, sloppy: true, vars: true, white: true, plusplus: true */
/*jslint indent: 2, nomen: true, maxlen: 120, sloppy: true, vars: true, white: true, plusplus: true */
/*global ArangoServerState, require, exports */
////////////////////////////////////////////////////////////////////////////////