Merge remote-tracking branch 'upstream/master'

bigchaindb · Oct 23, 2018 · a0f807c · a0f807c
2 parents b55907f + 1708937
commit a0f807c
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 12 deletions.
diff --git a/dist/browser/bigchaindb-orm.amd.min.js b/dist/browser/bigchaindb-orm.amd.min.js
diff --git a/dist/browser/bigchaindb-orm.amd.min.js.map b/dist/browser/bigchaindb-orm.amd.min.js.map
diff --git a/dist/browser/bigchaindb-orm.cjs.min.js b/dist/browser/bigchaindb-orm.cjs.min.js
diff --git a/dist/browser/bigchaindb-orm.cjs.min.js.map b/dist/browser/bigchaindb-orm.cjs.min.js.map
diff --git a/dist/browser/bigchaindb-orm.cjs2.min.js b/dist/browser/bigchaindb-orm.cjs2.min.js
diff --git a/dist/browser/bigchaindb-orm.cjs2.min.js.map b/dist/browser/bigchaindb-orm.cjs2.min.js.map
diff --git a/dist/browser/bigchaindb-orm.umd.min.js b/dist/browser/bigchaindb-orm.umd.min.js
diff --git a/dist/browser/bigchaindb-orm.umd.min.js.map b/dist/browser/bigchaindb-orm.umd.min.js.map
diff --git a/dist/browser/bigchaindb-orm.window.min.js b/dist/browser/bigchaindb-orm.window.min.js
diff --git a/dist/browser/bigchaindb-orm.window.min.js.map b/dist/browser/bigchaindb-orm.window.min.js.map
diff --git a/dist/node/ormobject.js b/dist/node/ormobject.js
@@ -75,12 +75,14 @@ var OrmObject = function () {
         value: function create(inputs) {
             var _this2 = this;
 
+            var id = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : (0, _v2.default)();
+
             if (inputs === undefined) {
                 console.error('inputs missing');
             }
             var assetPayload = {
                 'schema': this._schema,
-                'id': 'id:' + this._appId + ':' + this._name + ':' + (0, _v2.default)()
+                'id': 'id:' + this._appId + ':' + this._name + ':' + id
             };
             return this._connection.createTransaction(inputs.keypair.publicKey, inputs.keypair.privateKey, assetPayload, inputs.data).then(function (tx) {
                 return Promise.resolve(_this2._connection.getSortedTransactions(tx.id).then(function (txList) {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bigchaindb-orm",
-  "version": "3.0.1",
+  "version": "3.0.3",
   "description": "A CRAB-based ORM for BigchainDB",
   "homepage": "https://www.bigchaindb.com/",
   "bugs": "https://github.com/bigchaindb/js-driver-orm/issues",