Merge branch 'master' into 'master'

Fix ent.app install issue when installing via roles

See merge request entgra/carbon-device-mgt-plugins!71
revert-dabc3590
Milan Perera 5 years ago
commit 2c043363db

@ -109,8 +109,13 @@ public class ApplicationOperationsImpl implements ApplicationOperations {
.getDeviceManagementService(applicationOperationAction.getTenantId()). .getDeviceManagementService(applicationOperationAction.getTenantId()).
getAllDevicesOfRole(userRole); getAllDevicesOfRole(userRole);
for (org.wso2.carbon.device.mgt.common.Device device : deviceList) { for (org.wso2.carbon.device.mgt.common.Device device : deviceList) {
if (MDMAppConstants.ACTIVE.equalsIgnoreCase(device.getEnrolmentInfo().getStatus().toString())) { if (MDMAppConstants.WEBAPP.equals(applicationOperationAction.getApp().getPlatform())
deviceIdentifiers.add(getDeviceIdentifierByDevice(device)); || applicationOperationAction.getApp().getPlatform()
.equalsIgnoreCase(device.getType())) {
if (MDMAppConstants.ACTIVE
.equalsIgnoreCase(device.getEnrolmentInfo().getStatus().toString())) {
deviceIdentifiers.add(getDeviceIdentifierByDevice(device));
}
} }
} }
} }

Loading…
Cancel
Save