From b77aefa02c6e560ccc5444c96be9f6f0e5d2cb7c Mon Sep 17 00:00:00 2001 From: Shavindri Date: Tue, 4 Oct 2016 13:34:44 +0530 Subject: [PATCH 01/14] test push --- .../carbon/certificate/mgt/jaxrs/api/CertificateMgtService.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/api/CertificateMgtService.java b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/api/CertificateMgtService.java index 6527bff32de..4c337d05468 100644 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/api/CertificateMgtService.java +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/api/CertificateMgtService.java @@ -33,6 +33,8 @@ public interface CertificateMgtService { notes = "This will return a signed certificate upon a given CSR.", tags = "Device Management") @ApiResponses( + + value = { @ApiResponse( code = 200, From 3d383b0414f6fbca4526af09a1cffcc328c254d0 Mon Sep 17 00:00:00 2001 From: Shavindri Date: Tue, 4 Oct 2016 13:39:08 +0530 Subject: [PATCH 02/14] test push reverse --- .../carbon/certificate/mgt/jaxrs/api/CertificateMgtService.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/api/CertificateMgtService.java b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/api/CertificateMgtService.java index 4c337d05468..6527bff32de 100644 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/api/CertificateMgtService.java +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/api/CertificateMgtService.java @@ -33,8 +33,6 @@ public interface CertificateMgtService { notes = "This will return a signed certificate upon a given CSR.", tags = "Device Management") @ApiResponses( - - value = { @ApiResponse( code = 200, From 1fe74905f27351917ffd5d64d8135d2ada153dd2 Mon Sep 17 00:00:00 2001 From: kamidu Date: Wed, 5 Oct 2016 18:11:46 +0530 Subject: [PATCH 03/14] Fix for the redirection and ui related issues --- .../app/pages/cdmf.page.users/public/js/listing.js | 4 +--- .../public/js/dataTables.extended.js | 3 +-- .../units/cdmf.unit.notification.listing/listing.hbs | 2 +- .../public/js/notification-listing.js | 11 ++++++++++- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/js/listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/js/listing.js index 9774be7b34c..4a69e766722 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/js/listing.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/js/listing.js @@ -411,7 +411,5 @@ $(document).ready(function () { if (!$("#can-invite").val()) { $("#invite-user-button").remove(); } - $(".viewEnabledIcon").click(function () { - InitiateViewOption(); - }); + }); diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.data-tables-extended/public/js/dataTables.extended.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.data-tables-extended/public/js/dataTables.extended.js index 812acca6f7f..339b60f0690 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.data-tables-extended/public/js/dataTables.extended.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.data-tables-extended/public/js/dataTables.extended.js @@ -25,8 +25,7 @@ $.fn.datatables_extended = function(settings){ // EMM related function if (InitiateViewOption) { - $(".viewEnabledIcon").unbind("click"); - $(".viewEnabledIcon").bind("click", InitiateViewOption); + $(document).on('click','.viewEnabledIcon',InitiateViewOption); } //--- End of EMM related codes diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.notification.listing/listing.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.notification.listing/listing.hbs index b17fb406763..b542e9037c7 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.notification.listing/listing.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.notification.listing/listing.hbs @@ -22,7 +22,7 @@

- Device Notifications +

Device Notifications



diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.notification.listing/public/js/notification-listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.notification.listing/public/js/notification-listing.js index 22e8da110ae..29026b82784 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.notification.listing/public/js/notification-listing.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.notification.listing/public/js/notification-listing.js @@ -65,6 +65,15 @@ function loadNotifications() { function showAdvanceOperation(operation, button) { $(button).addClass('selected'); $(button).siblings().removeClass('selected'); + + if ($(button).attr("id") == 'allNotifications') { + $("#ast-container").html('
You do not have any unread notifications
'); + } else if ($(button).attr("id") == 'unReadNotifications') { + $("#ast-container").html('
You do not have any notifications
'); + } else { + $("#ast-container").html('
You do not have any notifications
'); + } + var hiddenOperation = ".wr-hidden-operations-content > div"; $(hiddenOperation + '[data-operation="' + operation + '"]').show(); $(hiddenOperation + '[data-operation="' + operation + '"]').siblings().hide(); @@ -82,7 +91,7 @@ $(document).ready(function () { loadNotifications(); - $("#ast-container").on("click", ".new-notification", function(e) { + $("#ast-container").on("click", ".new-notification", function (e) { var notificationId = $(this).data("id"); // var redirectUrl = $(this).data("url"); var query = deviceMgtAPIBaseURI + "/notifications" + "/" + notificationId + "/mark-checked"; From 88ec5246ec06e1b4495eb0672b8a33edd00fd483 Mon Sep 17 00:00:00 2001 From: thusithakalugamage Date: Wed, 5 Oct 2016 19:17:51 +0530 Subject: [PATCH 04/14] [EMM-1694] - Header responsive issues fix --- .../app/units/uuf.unit.header.logo/logo.hbs | 5 ++++- .../units/uuf.unit.header.user-menu/user-menu.hbs | 7 +------ .../app/units/uuf.unit.header/header.hbs | 4 ++-- .../units/uuf.unit.theme/public/css/theme-wso2.css | 12 +++++++++++- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.header.logo/logo.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.header.logo/logo.hbs index 2c13e661f92..4ce5f300d4b 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.header.logo/logo.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.header.logo/logo.hbs @@ -19,6 +19,9 @@ -

{{#defineZone "productName"}}Unified UI Template App{{/defineZone}}

+

+ 
 + {{#defineZone "productNameResponsive"}}UUI Tmpl. App{{/defineZone}} +

{{/zone}} \ No newline at end of file diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.header.user-menu/user-menu.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.header.user-menu/user-menu.hbs index f18ad409db1..d14d5dfed6b 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.header.user-menu/user-menu.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.header.user-menu/user-menu.hbs @@ -27,12 +27,7 @@ {{@user.username}} -