100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Fix GWT manager delete asset (Fixes #129)
Rich Turner41b09c6e4761
diff --git a/client/src/main/java/org/openremote/app/client/assets/asset/AssetEditActivity.java b/client/src/main/java/org/openremote/app/client/assets/asset/AssetEditActivity.javaindex d70f0192a..7eb4d12fd 100644--- a/client/src/main/java/org/openremote/app/client/assets/asset/AssetEditActivity.java+++ b/client/src/main/java/org/openremote/app/client/assets/asset/AssetEditActivity.java@@ -19,6 +19,7 @@*/package org.openremote.app.client.assets.asset;+import com.google.gwt.typedarrays.client.JsUtils;import com.google.gwt.user.client.ui.IsWidget;import org.openremote.app.client.Environment;import org.openremote.app.client.assets.*;@@ -31,6 +32,7 @@ import org.openremote.app.client.event.ShowFailureEvent;import org.openremote.app.client.event.ShowSuccessEvent;import org.openremote.app.client.interop.jackson.FileInfoMapper;import org.openremote.app.client.interop.value.ObjectValueMapper;+import org.openremote.app.client.util.JsUtil;import org.openremote.app.client.widget.AttributeLinkEditor;import org.openremote.app.client.widget.AttributeRefEditor;import org.openremote.app.client.widget.FormButton;diff --git a/client/src/main/java/org/openremote/app/client/util/JsUtil.java b/client/src/main/java/org/openremote/app/client/util/JsUtil.javaindex c57c492c1..11d71afcc 100644--- a/client/src/main/java/org/openremote/app/client/util/JsUtil.java+++ b/client/src/main/java/org/openremote/app/client/util/JsUtil.java@@ -19,6 +19,10 @@*/package org.openremote.app.client.util;+import jsinterop.annotations.JsMethod;++import java.util.List;+public class JsUtil {public native static void log(Object o) /*-{@@ -38,4 +42,12 @@ public class JsUtil {}}-*/;++ @JsMethod(namespace = "JsUtil")+ public static Object toJsArray(Object obj) {+ if (obj instanceof List) {+ return ((List)obj).toArray(new Object[0]);+ }+ return obj;+ }}diff --git a/container/src/main/resources/org/openremote/container/web/jsapi/client.js b/container/src/main/resources/org/openremote/container/web/jsapi/client.jsindex 839007de1..7feaf4829 100644--- a/container/src/main/resources/org/openremote/container/web/jsapi/client.js+++ b/container/src/main/resources/org/openremote/container/web/jsapi/client.js@@ -225,7 +225,10 @@ openremote.REST.log = function (string) {};openremote.REST._addToArray = function (array, name, value) {- if (value instanceof Array) {+ // JsInterop method to convert lists to JS Arrays+ value = JsUtil.toJsArray(value);++ if (Array.isArray(value)) {for (var i = 0; i < value.length; i++) {array.push([name, value[i]]);}