adam/guacamole-client
1
0 Fork 0
Code Issues Pull Requests 1 Packages Releases Wiki Activity

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

Browse Source
This commit is contained in:
Michael Jumper committed 2015-01-04 21:13:22 -08:00
1 parent b66c543bda
commit 3673f6cd03
2 files changed
+4 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connection/ConnectionRESTService.java
+2 -2
View File
@@ -314,8 +314,8 @@ public class ConnectionRESTService {
ConnectionGroup updatedParentGroup = retrievalService.retrieveConnectionGroup(userContext, connection.getParentIdentifier());
// Update connection parent, if changed
if ( (oldParentIdentifier != null && !oldParentIdentifier.equals(updatedParentGroup.getParentIdentifier()))
|| (oldParentIdentifier == null && updatedParentGroup.getParentIdentifier() != null))
if ( (oldParentIdentifier != null && !oldParentIdentifier.equals(updatedParentGroup.getIdentifier()))
|| (oldParentIdentifier == null && updatedParentGroup.getIdentifier() != null))
connectionDirectory.move(connectionID, updatedParentGroup.getConnectionDirectory());
}
guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connectiongroup/ConnectionGroupRESTService.java
+2 -2
View File
@@ -370,8 +370,8 @@ public class ConnectionGroupRESTService {
ConnectionGroup updatedParentGroup = retrievalService.retrieveConnectionGroup(userContext, connectionGroup.getParentIdentifier());
// Update connection group parent, if changed
if ( (oldParentIdentifier != null && !oldParentIdentifier.equals(updatedParentGroup.getParentIdentifier()))
|| (oldParentIdentifier == null && updatedParentGroup.getParentIdentifier() != null))
if ( (oldParentIdentifier != null && !oldParentIdentifier.equals(updatedParentGroup.getIdentifier()))
|| (oldParentIdentifier == null && updatedParentGroup.getIdentifier() != null))
connectionGroupDirectory.move(connectionGroupID, updatedParentGroup.getConnectionGroupDirectory());
}