You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by vn...@apache.org on 2018/09/08 22:41:41 UTC
[1/2] guacamole-client git commit: GUACAMOLE-220: Add missing
definitions for CREATE_USER_GROUP system permission.
Repository: guacamole-client
Updated Branches:
refs/heads/staging/1.0.0 764006534 -> 248e64531
GUACAMOLE-220: Add missing definitions for CREATE_USER_GROUP system permission.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/3492b556
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/3492b556
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/3492b556
Branch: refs/heads/staging/1.0.0
Commit: 3492b556c39ecf5fc3301d35fbb2cc282bb796cb
Parents: 402ddb5
Author: Michael Jumper <mj...@apache.org>
Authored: Sat Sep 8 13:01:03 2018 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Sat Sep 8 13:09:24 2018 -0700
----------------------------------------------------------------------
.../apache/guacamole/net/auth/permission/SystemPermission.java | 5 +++++
guacamole/src/main/webapp/app/rest/types/PermissionSet.js | 5 +++++
2 files changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/3492b556/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/SystemPermission.java
----------------------------------------------------------------------
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/SystemPermission.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/SystemPermission.java
index b54ba90..054caf0 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/SystemPermission.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/SystemPermission.java
@@ -38,6 +38,11 @@ public class SystemPermission implements Permission<SystemPermission.Type> {
CREATE_USER,
/**
+ * Create user groups.
+ */
+ CREATE_USER_GROUP,
+
+ /**
* Create connections.
*/
CREATE_CONNECTION,
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/3492b556/guacamole/src/main/webapp/app/rest/types/PermissionSet.js
----------------------------------------------------------------------
diff --git a/guacamole/src/main/webapp/app/rest/types/PermissionSet.js b/guacamole/src/main/webapp/app/rest/types/PermissionSet.js
index 2bc2e9e..9dd1ac8 100644
--- a/guacamole/src/main/webapp/app/rest/types/PermissionSet.js
+++ b/guacamole/src/main/webapp/app/rest/types/PermissionSet.js
@@ -143,6 +143,11 @@ angular.module('rest').factory('PermissionSet', [function definePermissionSet()
CREATE_USER : "CREATE_USER",
/**
+ * Permission to create new user groups.
+ */
+ CREATE_USER_GROUP : "CREATE_USER_GROUP",
+
+ /**
* Permission to create new connections.
*/
CREATE_CONNECTION : "CREATE_CONNECTION",
[2/2] guacamole-client git commit: GUACAMOLE-220: Merge add missing
definitions for CREATE_USER_GROUP system permission.
Posted by vn...@apache.org.
GUACAMOLE-220: Merge add missing definitions for CREATE_USER_GROUP system permission.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/248e6453
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/248e6453
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/248e6453
Branch: refs/heads/staging/1.0.0
Commit: 248e64531da5232aeb7ea47f0933d51967cc467d
Parents: 7640065 3492b55
Author: Nick Couchman <vn...@apache.org>
Authored: Sat Sep 8 18:40:10 2018 -0400
Committer: Nick Couchman <vn...@apache.org>
Committed: Sat Sep 8 18:40:10 2018 -0400
----------------------------------------------------------------------
.../apache/guacamole/net/auth/permission/SystemPermission.java | 5 +++++
guacamole/src/main/webapp/app/rest/types/PermissionSet.js | 5 +++++
2 files changed, 10 insertions(+)
----------------------------------------------------------------------