safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 13:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUAC-983: Move connections/groups based on parent, not parent of parent.

Browse Source
This commit is contained in:
Michael Jumper
2015-01-04 21:13:18 -08:00
parent b66c543bda
commit 3673f6cd03
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connection/ConnectionRESTService.java
View File

@@ -314,8 +314,8 @@ public class ConnectionRESTService {
ConnectionGroup updatedParentGroup = retrievalService.retrieveConnectionGroup(userContext, connection.getParentIdentifier()); ConnectionGroup updatedParentGroup = retrievalService.retrieveConnectionGroup(userContext, connection.getParentIdentifier());
// Update connection parent, if changed // Update connection parent, if changed
if ( (oldParentIdentifier != null && !oldParentIdentifier.equals(updatedParentGroup.getParentIdentifier())) if ( (oldParentIdentifier != null && !oldParentIdentifier.equals(updatedParentGroup.getIdentifier()))
|| (oldParentIdentifier == null && updatedParentGroup.getParentIdentifier() != null)) || (oldParentIdentifier == null && updatedParentGroup.getIdentifier() != null))
connectionDirectory.move(connectionID, updatedParentGroup.getConnectionDirectory()); connectionDirectory.move(connectionID, updatedParentGroup.getConnectionDirectory());
} }

4
guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connectiongroup/ConnectionGroupRESTService.java
View File

@@ -370,8 +370,8 @@ public class ConnectionGroupRESTService {
ConnectionGroup updatedParentGroup = retrievalService.retrieveConnectionGroup(userContext, connectionGroup.getParentIdentifier()); ConnectionGroup updatedParentGroup = retrievalService.retrieveConnectionGroup(userContext, connectionGroup.getParentIdentifier());
// Update connection group parent, if changed // Update connection group parent, if changed
if ( (oldParentIdentifier != null && !oldParentIdentifier.equals(updatedParentGroup.getParentIdentifier())) if ( (oldParentIdentifier != null && !oldParentIdentifier.equals(updatedParentGroup.getIdentifier()))
|| (oldParentIdentifier == null && updatedParentGroup.getParentIdentifier() != null)) || (oldParentIdentifier == null && updatedParentGroup.getIdentifier() != null))
connectionGroupDirectory.move(connectionGroupID, updatedParentGroup.getConnectionGroupDirectory()); connectionGroupDirectory.move(connectionGroupID, updatedParentGroup.getConnectionGroupDirectory());
} }