Merge branch '2.3.0' of http://10.73.97.24/oecloud.io/oe-node-red-nodes

EdgeVerve · Oct 6, 2020 · 32f709c · 32f709c
2 parents a540b00 + 5e1e622
commit 32f709c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/create-data/create-data.js b/create-data/create-data.js
@@ -34,7 +34,7 @@ module.exports = function (RED) {
       var msgPayload;
       if (msg.payload) {
         try {
-          msgPayload = JSON.parse(msg.payload);
+          msgPayload = (typeof msg.payload === 'string') ? JSON.parse(msg.payload) : msg.payload;
         } catch (exp) { msgPayload = false;}
       }
       if (msgPayload) {

diff --git a/find-data/find-data.js b/find-data/find-data.js
@@ -73,11 +73,11 @@ module.exports = function (RED) {
               'text': 'Found ' + response.length + ' records'
             });
             msg.resultModelName = modelName;
-            response.forEach(function (instance, index) {
-              if (instance instanceof Model) {
-                response[index] = response[index].toObject();
-              }
-            });
+            // response.forEach(function (instance, index) {
+            //   if (instance instanceof Model) {
+            //     response[index] = response[index].toObject();
+            //   }
+            // });
             msg.payload = response;
             node.send([msg, null]);
           }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "oe-node-red-nodes",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "description": "Node-RED nodes for oeCloud based applications",
   "main": "node-red.js",
   "scripts": {
@@ -42,7 +42,7 @@
   "license": "MIT",
   "dependencies": {
     "async": "2.6.1",
-    "lodash": "4.17.14"
+    "lodash": "4.17.20"
   },
   "devDependencies": {
     "babel-eslint": "7.2.3",