From e03251f78c607c73a572e2f917171dd86b7e40e9 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Sat, 21 Jul 2018 13:59:52 -0700 Subject: [PATCH] GUACAMOLE-220: Include children of readable items within connection permission editor, as they are likely relevant to the administrative task at hand. --- .../app/manage/directives/connectionPermissionEditor.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/guacamole/src/main/webapp/app/manage/directives/connectionPermissionEditor.js b/guacamole/src/main/webapp/app/manage/directives/connectionPermissionEditor.js index 43fa6c5b0..8f1bec154 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); });