File tree Expand file tree Collapse file tree 2 files changed +2
-1
lines changed
java/onl/netfishers/netshot/rest
resources/www/js/views/devices Expand file tree Collapse file tree 2 files changed +2
-1
lines changed Original file line number Diff line number Diff line change @@ -2315,7 +2315,7 @@ public Device setDevice(@PathParam("id") @Parameter(description = "Device ID") L
2315
2315
DeviceCredentialSet rsCredentialSet = rsDevice .getSpecificCredentialSet ();
2316
2316
DeviceCredentialSet credentialSet = device .getSpecificCredentialSet ();
2317
2317
2318
- if (rsCredentialSet == null ) {
2318
+ if (rsCredentialSet == null && rsDevice . getCredentialSetIds () != null ) {
2319
2319
if (credentialSet != null ) {
2320
2320
session .remove (credentialSet );
2321
2321
device .setSpecificCredentialSet (null );
Original file line number Diff line number Diff line change @@ -74,6 +74,7 @@ define([
74
74
if ( credentialSet . type !== "Global" ) {
75
75
var credentialModel = new CredentialSetModel ( ) ;
76
76
device . specificCredentialSet = credentialModel . cleanUp ( credentialSet ) ;
77
+ device . credentialSetIds = null ;
77
78
}
78
79
saveModel . save ( device ) . done ( function ( data ) {
79
80
that . close ( ) ;
You can’t perform that action at this time.
0 commit comments