From 34e97aeeaedb99b7e7725f763866db139c47dee0 Mon Sep 17 00:00:00 2001 From: harshanl Date: Thu, 11 Aug 2016 14:03:09 +0530 Subject: [PATCH 1/2] Removed device search using roleName parameter. --- .../mgt/jaxrs/service/api/DeviceManagementService.java | 7 ------- .../jaxrs/service/impl/DeviceManagementServiceImpl.java | 1 - 2 files changed, 8 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceManagementService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceManagementService.java index b4714623b2a..4143b846597 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceManagementService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceManagementService.java @@ -114,13 +114,6 @@ public interface DeviceManagementService { @QueryParam("user") @Size(max = 45) String user, - @ApiParam( - name = "roleName", - value = "Role name of the devices to be fetched.", - required = false) - @QueryParam("roleName") - @Size(max = 45) - String roleName, @ApiParam( name = "ownership", allowableValues = "BYOD, COPE", diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java index 106e7b0fbcf..3697c1b0211 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java @@ -66,7 +66,6 @@ public class DeviceManagementServiceImpl implements DeviceManagementService { @QueryParam("name") @Size(max = 45) String name, @QueryParam("type") @Size(max = 45) String type, @QueryParam("user") @Size(max = 45) String user, - @QueryParam("roleName") @Size(max = 45) String roleName, @QueryParam("ownership") @Size(max = 45) String ownership, @QueryParam("status") @Size(max = 45) String status, @QueryParam("since") String since, From 632202899a9dec6a70d5272bfdc4347f9062965c Mon Sep 17 00:00:00 2001 From: dilanua Date: Fri, 12 Aug 2016 11:25:43 +0530 Subject: [PATCH 2/2] Fixing issues in bulk user invitations --- .../app/pages/cdmf.page.users/public/js/listing.js | 6 +++--- 1 file changed, 3 insertions(+), 3 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 abd9c2da6db..3d48c71ae80 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 @@ -264,12 +264,12 @@ function loadUsers(searchParam) { }; return JSON.stringify( json ); - } + }; var fnCreatedRow = function( nRow, aData, iDataIndex ) { $(nRow).attr('data-type', 'selectable'); - $(nRow).attr('data-username', aData["username"]); - } + $(nRow).attr('data-username', aData["filter"]); + }; var columns = [ {