From bf2a814aae13313633f1ba26af45c780fe6847b7 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Wed, 2 Sep 2015 23:03:47 -0700 Subject: [PATCH] GUAC-586: Permission functions should not just work - they should be correct. --- .../settings/directives/guacSettingsConnections.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/guacamole/src/main/webapp/app/settings/directives/guacSettingsConnections.js b/guacamole/src/main/webapp/app/settings/directives/guacSettingsConnections.js index e2032dad7..fe0449fe2 100644 --- a/guacamole/src/main/webapp/app/settings/directives/guacSettingsConnections.js +++ b/guacamole/src/main/webapp/app/settings/directives/guacSettingsConnections.js @@ -140,7 +140,7 @@ angular.module('settings').directive('guacSettingsConnections', [function guacSe // Abort if permissions have not yet loaded if (!$scope.permissions) - return null; + return false; // For each data source for (var dataSource in $scope.permissions) { @@ -151,12 +151,12 @@ angular.module('settings').directive('guacSettingsConnections', [function guacSe // Can create connections if adminstrator or have explicit permission if (PermissionSet.hasSystemPermission(permissionSet, PermissionSet.SystemPermissionType.ADMINISTER) || PermissionSet.hasSystemPermission(permissionSet, PermissionSet.SystemPermissionType.CREATE_CONNECTION)) - return dataSource; + return true; } // No data sources allow connection creation - return null; + return false; }; @@ -172,7 +172,7 @@ angular.module('settings').directive('guacSettingsConnections', [function guacSe // Abort if permissions have not yet loaded if (!$scope.permissions) - return null; + return false; // For each data source for (var dataSource in $scope.permissions) { @@ -183,12 +183,12 @@ angular.module('settings').directive('guacSettingsConnections', [function guacSe // Can create connections groups if adminstrator or have explicit permission if (PermissionSet.hasSystemPermission(permissionSet, PermissionSet.SystemPermissionType.ADMINISTER) || PermissionSet.hasSystemPermission(permissionSet, PermissionSet.SystemPermissionType.CREATE_CONNECTION_GROUP)) - return dataSource; + return true; } // No data sources allow connection group creation - return null; + return false; };