community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
ayyoob 2016-08-12 12:27:35 +05:30
commit 3edc68d204
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceManagementService.java
View File

@ -114,13 +114,6 @@ public interface DeviceManagementService {
@QueryParam("user") @QueryParam("user")
@Size(max = 45) @Size(max = 45)
String user, String user,
@ApiParam(
name = "roleName",
value = "Role name of the devices to be fetched.",
required = false)
@QueryParam("roleName")
@Size(max = 45)
String roleName,
@ApiParam( @ApiParam(
name = "ownership", name = "ownership",
allowableValues = "BYOD, COPE", allowableValues = "BYOD, COPE",

1
components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java
View File

@ -66,7 +66,6 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
@QueryParam("name") @Size(max = 45) String name, @QueryParam("name") @Size(max = 45) String name,
@QueryParam("type") @Size(max = 45) String type, @QueryParam("type") @Size(max = 45) String type,
@QueryParam("user") @Size(max = 45) String user, @QueryParam("user") @Size(max = 45) String user,
@QueryParam("roleName") @Size(max = 45) String roleName,
@QueryParam("ownership") @Size(max = 45) String ownership, @QueryParam("ownership") @Size(max = 45) String ownership,
@QueryParam("status") @Size(max = 45) String status, @QueryParam("status") @Size(max = 45) String status,
@QueryParam("since") String since, @QueryParam("since") String since,

6
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/js/listing.js
View File

@ -264,12 +264,12 @@ function loadUsers(searchParam) {
}; };
return JSON.stringify( json ); return JSON.stringify( json );
} };
var fnCreatedRow = function( nRow, aData, iDataIndex ) { var fnCreatedRow = function( nRow, aData, iDataIndex ) {
$(nRow).attr('data-type', 'selectable'); $(nRow).attr('data-type', 'selectable');
$(nRow).attr('data-username', aData["username"]); $(nRow).attr('data-username', aData["filter"]);
} };
var columns = [ var columns = [
{ {