From 6634dded555ec73b19f0a2757f22518fd6cd1393 Mon Sep 17 00:00:00 2001 From: Dunith Dhanushka Date: Tue, 17 Jan 2017 15:09:05 +0530 Subject: [PATCH 01/10] Building the anchor text --- .../cdmf.unit.device.type.android.device-view/device-view.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.js b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.js index c192718e88..4dcc25e5dd 100644 --- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.js +++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.js @@ -213,7 +213,6 @@ function onRequest(context) { deviceViewData["autoCompleteParams"] = autoCompleteParams; deviceViewData["portalUrl"] = devicemgtProps['portalURL']; - deviceViewData["deviceId"] = deviceId; - deviceViewData["deviceType"] = deviceType; + deviceViewData["anchor"] = encodeURI(JSON.stringify({ "device" : { "id" : deviceId, "type" : deviceType}})); return deviceViewData; } From 54b08f9b7a7d99ae9df74252c34abec41661737d Mon Sep 17 00:00:00 2001 From: Dunith Dhanushka Date: Tue, 17 Jan 2017 15:10:46 +0530 Subject: [PATCH 02/10] Adding the JSON formatted anchor text --- .../cdmf.unit.device.type.android.device-view/device-view.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs index 38e3284f0a..4a24616964 100644 --- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs +++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs @@ -339,7 +339,7 @@
+ href="{{portalUrl}}/portal/dashboards/geo-dashboard/?GLOBAL-STATE={{anchor}}"> From d4107747ab9f572580c1ac4100312d5d282ccc69 Mon Sep 17 00:00:00 2001 From: Dunith Dhanushka Date: Tue, 17 Jan 2017 15:35:59 +0530 Subject: [PATCH 03/10] Update device-view.js --- .../device-view.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.js index a3ef93ec7b..e5ff0676c6 100644 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.js +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.js @@ -35,11 +35,11 @@ function onRequest(context) { "autoCompleteParams": autoCompleteParams, "encodedFeaturePayloads": "", "portalUrl" : devicemgtProps['portalURL'], - "anchor" : JSON.stringify(anchor) + "anchor" : encodeURI(JSON.stringify(anchor)) }; } else { response.sendError(404, "Device Id " + deviceId + " of type " + deviceType + " cannot be found!"); exit(); } } -} \ No newline at end of file +} From bbbfff28d95ddf687a651b22070a0c9b7d03ebf1 Mon Sep 17 00:00:00 2001 From: Dunith Dhanushka Date: Tue, 17 Jan 2017 15:40:27 +0530 Subject: [PATCH 04/10] UI Improvements for Geo Fencing --- .../device-view.hbs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.hbs b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.hbs index e23f3c0c1c..628f5fc116 100644 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.hbs +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.hbs @@ -44,7 +44,7 @@
  • Operations Log
  • Map
    • + aria-controls="geo_dashboard">Geo Fencing {{/zone}} {{#zone "device-view-tab-contents"}} @@ -77,18 +77,18 @@ {{/zone}} From 38216c4b9dd7a1411132ff92d358dd314741aa1b Mon Sep 17 00:00:00 2001 From: Hasunie Date: Tue, 17 Jan 2017 16:04:48 +0530 Subject: [PATCH 05/10] fixing win10,8.1 conflicting issues --- .../discovery/impl/DiscoveryServiceImpl.java | 8 +- .../enrollment/beans/ContextItem.java | 14 +-- .../public/templates/windows-policy-view.hbs | 109 ------------------ .../windows-web-agent/app/conf/app-conf.json | 6 +- .../windows-web-agent/app/conf/config.json | 4 +- 5 files changed, 14 insertions(+), 127 deletions(-) diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/discovery/impl/DiscoveryServiceImpl.java b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/discovery/impl/DiscoveryServiceImpl.java index 2ba4c9abc8..93337f0a2c 100644 --- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/discovery/impl/DiscoveryServiceImpl.java +++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/discovery/impl/DiscoveryServiceImpl.java @@ -68,13 +68,11 @@ public class DiscoveryServiceImpl implements DiscoveryService { String emailId = discoveryRequest.getEmailId(); String[] userDomains = emailId.split(DELIMITER); String domain = userDomains[DOMAIN_SEGMENT]; - String applicationVersion = discoveryRequest.getApplicationVersion(); - String[] osVersions = applicationVersion .split("\\."); - String os = osVersions[0]; DiscoveryResponse discoveryResponse; - if (PluginConstants.WindowsVersionProperties.OS_VERSION.equals(os) && FEDERATED.equals(getAuthPolicy())) { - discoveryResponse = new DiscoveryResponse(); + if (!PluginConstants.WindowsVersionProperties.REQUESTED_WIN81_VERSION.equals(discoveryRequest.getVersion()) + && FEDERATED.equals(getAuthPolicy())) { + discoveryResponse = new DiscoveryResponse(); discoveryResponse.setAuthPolicy(FEDERATED); discoveryResponse.setEnrollmentVersion(PluginConstants.WindowsVersionProperties.REQUESTED_WIN10_VERSION); discoveryResponse.setEnrollmentPolicyServiceUrl(PluginConstants.Discovery.DEVICE_ENROLLMENT_SUBDOMAIN + diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/enrollment/beans/ContextItem.java b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/enrollment/beans/ContextItem.java index dbc690aa43..68fac756cb 100644 --- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/enrollment/beans/ContextItem.java +++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/enrollment/beans/ContextItem.java @@ -20,18 +20,16 @@ package org.wso2.carbon.device.mgt.mobile.windows.api.services.enrollment.beans; import org.wso2.carbon.device.mgt.mobile.windows.api.common.PluginConstants; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.*; -@XmlAccessorType(XmlAccessType.PROPERTY) -@XmlType(name = "ContextItem", namespace = PluginConstants.SOAP_AUTHORIZATION_TARGET_NAMESPACE) +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "ContextItem", namespace = PluginConstants.SOAP_AUTHORIZATION_TARGET_NAMESPACE, + propOrder = {"Name", "Value"}) public class ContextItem { - @XmlElement(required = true, namespace = PluginConstants.SOAP_AUTHORIZATION_TARGET_NAMESPACE) + @XmlAttribute(name = "Name", required = true, namespace = PluginConstants.SOAP_AUTHORIZATION_TARGET_NAMESPACE) protected String Name; - @XmlElement(required = true, namespace = PluginConstants.SOAP_AUTHORIZATION_TARGET_NAMESPACE) + @XmlElement(name = "Value", required = true, namespace = PluginConstants.SOAP_AUTHORIZATION_TARGET_NAMESPACE) protected String Value; public String getValue() { diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.policy-view/public/templates/windows-policy-view.hbs b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.policy-view/public/templates/windows-policy-view.hbs index 2d6c205ef0..503c31dd5a 100644 --- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.policy-view/public/templates/windows-policy-view.hbs +++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.policy-view/public/templates/windows-policy-view.hbs @@ -295,114 +295,5 @@ - - -
    -
    - -
    -
    - - - -
    -
    - -
    - - - - - - - - - - - - - - -
    No:Application Name/DescriptionPackage Name
    - No entries added yet . -
    - - - - - - - - - - -
    -
    -
    -
    -
    - \ No newline at end of file diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/conf/app-conf.json b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/conf/app-conf.json index 5091d70b93..f34d6ccd97 100755 --- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/conf/app-conf.json +++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/conf/app-conf.json @@ -1,5 +1,5 @@ { - "appName": "WSO2 Enterprise Mobility Manager", + "appName": "WSO2 IOTS", "cachingEnabled": true, "debuggingEnabled": false, "permissionRoot": "/", @@ -38,8 +38,8 @@ }, "generalConfig" : { "host" : "https://localhost:9443", - "companyName" : "WSO2 Enterprise Mobility Manager", - "browserTitle" : "WSO2 EMM", + "companyName" : "WSO2 IOTS", + "browserTitle" : "WSO2 IOT", "copyrightPrefix" : "\u00A9 %date-year%, ", "copyrightOwner" : "WSO2 Inc.", "copyrightOwnersSite" : "http://www.wso2.org", diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/conf/config.json b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/conf/config.json index 7e4a733cda..207c08e5e4 100755 --- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/conf/config.json +++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/conf/config.json @@ -38,8 +38,8 @@ "windowsConfigRoot" : "%http.ip%/api/device-mgt/windows/v1.0/federated/bst/authentication", "generalConfig" : { "host" : "%http.ip%", - "companyName" : "WSO2 Enterprise Mobility Manager", - "browserTitle" : "WSO2 EMM", + "companyName" : "WSO2 IOT", + "browserTitle" : "WSO2 IOT", "copyrightText" : "\u00A9 %date-year%, WSO2 Inc. (http://www.wso2.org) All Rights Reserved." }, "isOAuthEnabled" : true, From f699ba54b3d905e64415f6edd0e74f2e3243ec4d Mon Sep 17 00:00:00 2001 From: Menaka Jayawardena Date: Tue, 17 Jan 2017 16:14:49 +0530 Subject: [PATCH 06/10] Added Api annotation to AndroidSenseService --- .../mgt/iot/androidsense/service/impl/AndroidSenseService.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/java/org/wso2/carbon/device/mgt/iot/androidsense/service/impl/AndroidSenseService.java b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/java/org/wso2/carbon/device/mgt/iot/androidsense/service/impl/AndroidSenseService.java index b259eb6b59..aca23b6322 100644 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/java/org/wso2/carbon/device/mgt/iot/androidsense/service/impl/AndroidSenseService.java +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/java/org/wso2/carbon/device/mgt/iot/androidsense/service/impl/AndroidSenseService.java @@ -69,6 +69,8 @@ import javax.ws.rs.core.Response; ) } ) +@Api(value = "Android Sense Device Management", + description = "This carries all the resources related to the Android sense device management functionalities.") public interface AndroidSenseService { /** From 88b8901f75a6a43a302422f232e0b38ad037abe4 Mon Sep 17 00:00:00 2001 From: Menaka Jayawardena Date: Tue, 17 Jan 2017 16:15:23 +0530 Subject: [PATCH 07/10] Removed unused Test page from portal dashboard. --- .../android_sense_dashboard/android-iot.json | 152 ------------------ 1 file changed, 152 deletions(-) diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sense_dashboard/android-iot.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sense_dashboard/android-iot.json index 41eaafb201..58a1b27184 100644 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sense_dashboard/android-iot.json +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sense_dashboard/android-iot.json @@ -56,13 +56,6 @@ "ishidden": false, "subordinates": [], "title": "Communication" - }, - { - "id": "test", - "isanon": false, - "ishidden": false, - "title": "Test", - "subordinates": [] } ], "pages": [ @@ -1299,151 +1292,6 @@ "fluidLayout": false }, "title": "Communication" - }, - { - "id": "test", - "title": "Test", - "layout": { - "content": { - "loggedIn": { - "blocks": [ - { - "id": "49cada6f023f237c953761b597752212", - "x": 0, - "y": 1, - "width": 5, - "height": 1, - "banner": false - }, - { - "id": "a26d2f62dbb0011edf13371a2eb3cdd1", - "x": 0, - "y": 0, - "width": 3, - "height": 1, - "banner": false - } - ] - } - }, - "fluidLayout": false - }, - "isanon": false, - "content": { - "default": { - "49cada6f023f237c953761b597752212": [ - { - "id": "date-picker-widget-0", - "content": { - "id": "date-picker-widget", - "title": "Date Picker Widget", - "type": "widget", - "category": "Widgets", - "thumbnail": "fs://gadget/date-picker-widget/index.png", - "data": { - "url": "fs://gadget/date-picker-widget/index.xml" - }, - "options": {}, - "styles": { - "no_heading": true, - "hide_gadget": false, - "titlePosition": "left", - "title": "Date Picker Widget" - }, - "notify": { - "date-selected": { - "type": "message", - "description": "This notifies selected date" - } - }, - "locale_titles": { - "en-US": "Date Picker Widget" - }, - "settings": { - "priority": "5", - "timeoutInterval": "60000" - } - } - } - ], - "33faa57accead8af549c70f111face99": [ - { - "id": "EsbAnalytics-Gadget-Search_Box-0", - "content": { - "id": "EsbAnalytics-Gadget-Search_Box", - "title": "Search Box", - "type": "widget", - "category": "Widgets", - "thumbnail": "fs://gadget/usa-business-revenue/index.png", - "data": { - "url": "fs://gadget/EsbAnalytics-Gadget-Search_Box/index.xml" - }, - "styles": { - "no_heading": true, - "hide_gadget": false, - "titlePosition": "left", - "title": "Search Box" - }, - "toolbarButtons": { - "default": { - "maximize": false, - "configurations": false - }, - "custom": [], - "isDropdownView": false - }, - "options": {}, - "locale_titles": { - "en-US": "Search Box" - }, - "settings": { - "priority": "5", - "timeoutInterval": "60000" - } - } - } - ], - "be290fcc084ff118decc23588febc2ed": [], - "a26d2f62dbb0011edf13371a2eb3cdd1": [ - { - "id": "Android_Device_SearchBox-0", - "content": { - "id": "Android_Device_SearchBox", - "title": "Search Box", - "type": "gadget", - "category": "Gadgets", - "thumbnail": "fs://gadget/usa-business-revenue/index.png", - "data": { - "url": "fs://gadget/Android_Device_SearchBox/index.xml" - }, - "styles": { - "no_heading": true, - "hide_gadget": false, - "titlePosition": "left", - "title": "Search Box" - }, - "toolbarButtons": { - "default": { - "maximize": false, - "configurations": false - }, - "custom": [], - "isDropdownView": false - }, - "options": {}, - "locale_titles": { - "en-US": "Search Box" - }, - "settings": { - "priority": "5", - "timeoutInterval": "60000" - } - } - } - ] - }, - "anon": {} - } } ], "permissions": { From 95a7ff6aafc59baa645e2463aed48c43e2111ac8 Mon Sep 17 00:00:00 2001 From: Hasunie Date: Tue, 17 Jan 2017 16:48:10 +0530 Subject: [PATCH 08/10] fixing windows app-conf issue --- .../jaggeryapps/windows-web-agent/app/conf/app-conf.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/conf/app-conf.json b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/conf/app-conf.json index d8357c8663..ea1f69b675 100755 --- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/conf/app-conf.json +++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/conf/app-conf.json @@ -38,13 +38,8 @@ }, "generalConfig" : { "host" : "https://localhost:9443", -<<<<<<< HEAD - "companyName" : "WSO2 IOTS", - "browserTitle" : "WSO2 IOT", -======= "companyName" : "WSO2 IoT Server", "browserTitle" : "WSO2 IoT Server", ->>>>>>> 05e2cb7bb8db033166a81e327d1c82c83a5a8178 "copyrightPrefix" : "\u00A9 %date-year%, ", "copyrightOwner" : "WSO2 Inc.", "copyrightOwnersSite" : "http://www.wso2.org", From 62ba568e0541c86d6d8ade741c5e37f40ee94713 Mon Sep 17 00:00:00 2001 From: Imesh Chandrasiri Date: Tue, 17 Jan 2017 17:34:51 +0530 Subject: [PATCH 09/10] Fixed android type view notification pane message inconsistancy issue --- .../public/js/type-view.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/public/js/type-view.js b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/public/js/type-view.js index 5f33fdb5b7..7d9c779212 100755 --- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/public/js/type-view.js +++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/public/js/type-view.js @@ -131,7 +131,10 @@ function loadNewNotifications() { viewModel["appContext"] = context; $(messageSideBar).html(template(viewModel)); } else { - $(messageSideBar).html(''); + $(messageSideBar).html("

    No New Notifications

    " + + "
    " + + "Check this section for error notifications
    related to device operations" + + "
    "); } } else { $(messageSideBar).html("

    Unexpected error " + From dc840c389a006345d9f450c9ce4127acf3b445b7 Mon Sep 17 00:00:00 2001 From: Imesh Chandrasiri Date: Tue, 17 Jan 2017 17:48:12 +0530 Subject: [PATCH 10/10] Fix for inconsistant notification message --- .../public/js/type-view.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/public/js/type-view.js b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/public/js/type-view.js index cd364ebbd0..9d6bcd2666 100644 --- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/public/js/type-view.js +++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/public/js/type-view.js @@ -131,7 +131,10 @@ function loadNewNotifications() { viewModel["appContext"] = context; $(messageSideBar).html(template(viewModel)); } else { - $(messageSideBar).html(''); + $(messageSideBar).html("

    No New Notifications

    " + + "
    " + + "Check this section for error notifications
    related to device operations" + + "
    "); } } else { $(messageSideBar).html("

    Unexpected error " +