Merge branch 'master' into develop/3.0

6 years ago · 45852c9bba
2 changed files with 4 additions and 4 deletions
--- a/application/src/main/data/json/demo/dashboards/gateways.json
+++ b/application/src/main/data/json/demo/dashboards/gateways.json
@ -5,7 +5,7 @@
      "94715984-ae74-76e4-20b7-2f956b01ed80": {
        "isSystemType": true,
        "bundleAlias": "entity_admin_widgets",
-        "typeAlias": "device_admin_table2",
+        "typeAlias": "device_admin_table",
        "type": "latest",
        "title": "New widget",
        "sizeX": 24,
@ -1264,4 +1264,4 @@
    }
  },
  "name": "Gateways"
-}
+}
--- a/application/src/main/data/json/system/widget_bundles/entity_admin_widgets.json
+++ b/application/src/main/data/json/system/widget_bundles/entity_admin_widgets.json
@ -6,7 +6,7 @@
  },
  "widgetTypes": [
    {
-      "alias": "device_admin_table2",
+      "alias": "device_admin_table",
      "name": "Device admin table",
      "descriptor": {
        "type": "latest",
@ -22,7 +22,7 @@
      }
    },
    {
-      "alias": "device_admin_table",
+      "alias": "asset_admin_table",
      "name": "Asset admin table",
      "descriptor": {
        "type": "latest",