Merge branch 'master' of https://github.com/wso2/carbon-device-mgt

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",

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,

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 = [
         {