community/device-mgt-plugins
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-plugins.git synced 2025-09-16 23:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #425 from geethkokila/master

Browse Source 
Fixing the app manager issue by calling the correct getDevices method
This commit is contained in:
Geeth 2016-11-27 07:45:58 +05:30 committed by GitHub
commit 44cd2d6b8d
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/extensions/org.wso2.carbon.appmgt.mdm.osgiconnector/src/main/java/org/wso2/carbon/appmgt/mdm/osgiconnector/ApplicationOperationsImpl.java
View File

@ -233,7 +233,8 @@ public class ApplicationOperationsImpl implements ApplicationOperations {
List<org.wso2.carbon.device.mgt.common.Device> deviceList = MDMServiceAPIUtils List<org.wso2.carbon.device.mgt.common.Device> deviceList = MDMServiceAPIUtils
.getDeviceManagementService(applicationOperationDevice.getTenantId()). .getDeviceManagementService(applicationOperationDevice.getTenantId()).
getDevicesOfUser( getDevicesOfUser(
applicationOperationDevice.getCurrentUser().getUsername()); applicationOperationDevice.getCurrentUser().getUsername(),
applicationOperationDevice.getPlatform());
devices = new ArrayList<>(deviceList.size()); devices = new ArrayList<>(deviceList.size());
if(log.isDebugEnabled()){ if(log.isDebugEnabled()){
log.debug("device list got from mdm "+ deviceList.toString()); log.debug("device list got from mdm "+ deviceList.toString());

2
pom.xml
View File

@ -1202,7 +1202,7 @@
<javax.ws.rs.version>1.1.1</javax.ws.rs.version> <javax.ws.rs.version>1.1.1</javax.ws.rs.version>
<!-- Carbon Device Management --> <!-- Carbon Device Management -->
<carbon.devicemgt.version>1.2.6</carbon.devicemgt.version> <carbon.devicemgt.version>1.2.7-SNAPSHOT</carbon.devicemgt.version>
<carbon.devicemgt.version.range>[1.1.1, 2.0.0)</carbon.devicemgt.version.range> <carbon.devicemgt.version.range>[1.1.1, 2.0.0)</carbon.devicemgt.version.range>