Merge branch 'delete-fix' into 'master'

Fix delete

See merge request entgra/carbon-device-mgt!300

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java

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

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

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