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/07/26 10:18:42 UTC
[6/9] guacamole-client git commit: GUACAMOLE-220: Include children of
readable items within connection permission editor,
as they are likely relevant to the administrative task at hand.
GUACAMOLE-220: Include children of readable items within connection permission editor, as they are likely relevant to the administrative task at hand.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/e03251f7
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/e03251f7
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/e03251f7
Branch: refs/heads/master
Commit: e03251f78c607c73a572e2f917171dd86b7e40e9
Parents: 62e58ea
Author: Michael Jumper <mj...@apache.org>
Authored: Sat Jul 21 13:59:52 2018 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Sat Jul 21 14:23:50 2018 -0700
----------------------------------------------------------------------
.../app/manage/directives/connectionPermissionEditor.js | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/e03251f7/guacamole/src/main/webapp/app/manage/directives/connectionPermissionEditor.js
----------------------------------------------------------------------
diff --git a/guacamole/src/main/webapp/app/manage/directives/connectionPermissionEditor.js b/guacamole/src/main/webapp/app/manage/directives/connectionPermissionEditor.js
index 43fa6c5..8f1bec1 100644
--- a/guacamole/src/main/webapp/app/manage/directives/connectionPermissionEditor.js
+++ b/guacamole/src/main/webapp/app/manage/directives/connectionPermissionEditor.js
@@ -289,9 +289,12 @@ angular.module('manage').directive('connectionPermissionEditor', ['$injector',
// their parents
child = copyReadable(child, flags);
- // Include child only if they are explicitly readable or
- // they have explicitly readable descendants
- if ((child.children && child.children.length) || isReadable(child, flags))
+ // Include child only if they are explicitly readable, they
+ // have explicitly readable descendants, or their parent is
+ // readable (and thus all children are relevant)
+ if ((child.children && child.children.length)
+ || isReadable(item, flags)
+ || isReadable(child, flags))
children.push(child);
});