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 'delete-fix' into 'master'

Browse Source 
Fix delete

See merge request entgra/carbon-device-mgt!300
This commit is contained in:
Dharmakeerthi Lasantha 2019-10-10 03:11:23 +00:00
commit 90fd12d876
2 changed files with 5 additions and 0 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/service/DeviceManagementProviderServiceImpl.java
View File

@ -605,6 +605,8 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
"' devices";
log.error(msg, e);
throw new DeviceManagementException(msg, e);
} finally {
DeviceManagementDAOFactory.closeConnection();
}
}

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

@ -932,6 +932,9 @@ function attachDeviceEvents() {
}
}
$(modalPopupContent).html($('#delete-device-modal-content').html());
showPopup();
$("a#delete-device-yes-link").click(function () {
deleteDevices(deviceIdentifiers);
});