- Fix delete button in UI
- Close connection in DAO
merge-requests/300/head
Amanda 5 years ago
parent 277b114f9c
commit 7b7d47a2bf

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

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

Loading…
Cancel
Save