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

Browse Source
This commit is contained in:
Dileesha Rajapakse 2017-07-18 09:42:12 +05:30
commit eadb7ea02a
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/task/impl/DeviceTaskManagerImpl.java
View File

@ -92,7 +92,7 @@ public class DeviceTaskManagerImpl implements DeviceTaskManager {
operations = this.getValidOperationNames(); //list operations for each device type
devices = deviceManagementProviderService.getAllDevices(deviceType, false);//list devices for each type
if (!devices.isEmpty()) {
if (operations != null) {
if (operations != null && DeviceManagerUtil.getValidDeviceIdentifiers(devices).size() != 0) {
for (String str : operations) {
CommandOperation operation = new CommandOperation();
operation.setEnabled(true);

1
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DeviceManagerUtil.java
View File

@ -247,6 +247,7 @@ public final class DeviceManagerUtil {
switch (device.getEnrolmentInfo().getStatus()) {
case BLOCKED:
case REMOVED:
break;
case SUSPENDED:
break;
default: