next stable release

AWhiteKnight · Jul 23, 2019 · fbf9441 · fbf9441
1 parent bf22a7f
commit fbf9441
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 36 deletions.
diff --git a/README.md b/README.md
@@ -32,21 +32,16 @@ MoMa needs at least nodejs version 8 / ES6.
 
 ## Changelog
 
-### 1.1.4 (2019-07-22)
-* (AWhiteKnight) Library 'systeminformation' version 4.14.x, 
-                 Update of Adapters and JS-Controller.
-
-### 1.1.3 (2019-07-03)
-* (AWhiteKnight) Bugfixes, Library 'systeminformation' version 4.13.1, dockerInfo in Interval 3
-
-### 1.1.2 (2019-06-05)
-* (AWhiteKnight) intensive logging in debug mode silly to find reason for issue #24
-
-### 1.1.1 (2019-05-23)
-* (AWhiteKnight) dockerContainers in Interval 3. Library 'systeminformation' version 4.5.1
+### 1.2.0 (2019-07-26)
+* (AWhiteKnight) Library 'systeminformation' version 4.14.4, 
+                 check for update of Adapters and JS-Controller in Interval 4,
+				 dockerInfo, dockerContainers in Interval 3,
+				 moma admin-tab with update buttons for os, js-controller, adapters.
 
 ### 1.1.0 (2019-05-20)
-* (AWhiteKnight) Performance optimization. Fix of issue #24. Check internet latency.
+* (AWhiteKnight) Performance optimization,
+				 partial fix of Issu #24,
+				 Check internet latency.
 
 ### 1.0.0 (2019-05-11)
 * (AWhiteKnight) First release for adapter list 'stable'.

diff --git a/io-package.json b/io-package.json
@@ -1,27 +1,15 @@
 {
 	"common": {
 		"name": "moma",
-		"version": "1.1.4",
+		"version": "1.2.0",
 		"news": {
-            "1.1.4": {
-                "en": "systeminformation 4.14.1",
-                "de": "systeminformation 4.14.1"
-            },
-            "1.1.3": {
-                "en": "systeminformation 4.13.1, dockerInfo",
-                "de": "systeminformation 4.13.1, dockerInfo"
-            },
-            "1.1.2": {
-                "en": "debug mode silly to find issue #24",
-                "de": "debug mode silly um issu #24 aufzuspüren"
-            },
-            "1.1.1": {
-                "en": "Docker, systeminformation 4.5.1",
-                "de": "Docker, systeminformation 4.5.1"
+            "1.2.0": {
+                "en": "systeminformation 4.14.1, update adapters & js-controller, dockerInfo, dockerContainers",
+                "de": "systeminformation 4.14.1, update aller Adapter & des JS-Controllers, dockerInfo, dockerContainers"
             },
             "1.1.0": {
-                "en": "Performance optimization. Fix of issue #24. Check internet latency.",
-                "de": "Performance-Optimierung. Fix von Issue #24. Internet-Latenz prüfen"
+                "en": "Performance optimization, partial fix of issue #24. Check internet latency.",
+                "de": "Performance-Optimierung, teilw. Fix von Issue #24. Internet-Latenz prüfen"
             },
             "1.0.0": {
                 "en": "First release for adapter list 'stable'",
@@ -42,7 +30,7 @@
 				"es": "Versión inicial",
 				"pl": "Pierwsze wydanie",
 				"zh-cn": "初始发行"
-						}
+			}
 		},
         "title": "Monitoring & Maintenance",
         "titleLang": {

diff --git a/lib/helper.js b/lib/helper.js
@@ -450,7 +450,6 @@ async function createDeviceEntry(adapter, parent, name) {
 		},
 		native: {}
 	});
-	return id;
 }
 
 async function createChannelEntry(adapter, parent, name) {
@@ -625,9 +624,11 @@ module.exports.createMomaInstanceEntries = (adapter) => {
 					// not a state and not an object entry
 				} else {
 					// adapter.log.debug('object: ' + key0 + ' : ' + JSON.stringify(level0));
-					const parent0 = createDeviceEntry(adapter, null, key0);
+					const parent0 = key0;
+					createDeviceEntry(adapter, null, parent0);
 					// adapter.log.debug(JSON.stringify(parent0));
 					for (const key1 in level0) {
+						// adapter.log.debug(key1);
 						if (level0.hasOwnProperty(key1)) {
 							createEntry(adapter, level0[key1], parent0, key1);
 						}

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iobroker.moma",
-  "version": "1.1.4",
+  "version": "1.2.0",
   "description": "Monitoring and Maintenance",
   "author": {
     "name": "AWhiteKnight",
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@iobroker/adapter-core": "^1.0.3",
-    "systeminformation": "^4.14.1"
+    "systeminformation": "^4.14.4"
   },
   "devDependencies": {
     "@iobroker/testing": "^1.2.0",