Skip to content

Commit 0e518d0

Browse files
committed
fix(api): 🐛 fix specific credentials being lost when disabling a device
1 parent eb877ba commit 0e518d0

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

src/main/java/onl/netfishers/netshot/rest/RestService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2315,7 +2315,7 @@ public Device setDevice(@PathParam("id") @Parameter(description = "Device ID") L
23152315
DeviceCredentialSet rsCredentialSet = rsDevice.getSpecificCredentialSet();
23162316
DeviceCredentialSet credentialSet = device.getSpecificCredentialSet();
23172317

2318-
if (rsCredentialSet == null) {
2318+
if (rsCredentialSet == null && rsDevice.getCredentialSetIds() != null) {
23192319
if (credentialSet != null) {
23202320
session.remove(credentialSet);
23212321
device.setSpecificCredentialSet(null);

src/main/resources/www/js/views/devices/EditDeviceDialog.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ define([
7474
if (credentialSet.type !== "Global") {
7575
var credentialModel = new CredentialSetModel();
7676
device.specificCredentialSet = credentialModel.cleanUp(credentialSet);
77+
device.credentialSetIds = null;
7778
}
7879
saveModel.save(device).done(function(data) {
7980
that.close();

0 commit comments

Comments
 (0)