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

GUAC-932: Fix documented connection group filtering semantics.

Browse Source
This commit is contained in:
Michael Jumper
2014-12-18 21:14:42 -08:00
parent e16ba11899
commit 3b318ba870
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,7 +35,6 @@ import javax.ws.rs.PathParam;
import javax.ws.rs.Produces; import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam; import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response.Status;
import org.glyptodon.guacamole.GuacamoleClientException; import org.glyptodon.guacamole.GuacamoleClientException;
import org.glyptodon.guacamole.GuacamoleException; import org.glyptodon.guacamole.GuacamoleException;
import org.glyptodon.guacamole.GuacamoleResourceNotFoundException; import org.glyptodon.guacamole.GuacamoleResourceNotFoundException;
@@ -47,7 +46,6 @@ import org.glyptodon.guacamole.net.auth.UserContext;
import org.glyptodon.guacamole.net.auth.permission.ConnectionPermission; import org.glyptodon.guacamole.net.auth.permission.ConnectionPermission;
import org.glyptodon.guacamole.net.auth.permission.ObjectPermission; import org.glyptodon.guacamole.net.auth.permission.ObjectPermission;
import org.glyptodon.guacamole.net.basic.rest.AuthProviderRESTExposure; import org.glyptodon.guacamole.net.basic.rest.AuthProviderRESTExposure;
import org.glyptodon.guacamole.net.basic.rest.HTTPException;
import org.glyptodon.guacamole.net.basic.rest.auth.AuthenticationService; import org.glyptodon.guacamole.net.basic.rest.auth.AuthenticationService;
import org.glyptodon.guacamole.net.basic.rest.connection.APIConnection; import org.glyptodon.guacamole.net.basic.rest.connection.APIConnection;
import org.slf4j.Logger; import org.slf4j.Logger;
@@ -222,10 +220,10 @@ public class ConnectionGroupRESTService {
* The ID of the connection group to retrieve. * The ID of the connection group to retrieve.
* *
* @param permission * @param permission
* If specified, limit the returned list to only those connections and * If specified, limit the returned list to only those connections for
* connection groups for which the current user has the given * which the current user has the given permission. Otherwise, all
* permission. Otherwise, all visible connections and connection groups * visible connections are returned. Connection groups are unaffected
* are returned. * by this parameter.
* *
* @return * @return
* The requested connection group, including all descendants. * The requested connection group, including all descendants.