From 055219bc6ce776c0affc45e10b13f6e53abc4434 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mjumper@apache.org>
Date: Sat, 21 Jul 2018 14:02:57 -0700
Subject: [PATCH] GUACAMOLE-220: Rename "Selected Connections" to "Current
 Connections" for clarity.

"Selected Connections" vs. "All Connections" gives the impression that the tab controls how permissions are used, with "All Connections" being a mode where all connections are readable regardless of which are explicitly selected.
---
 .../manage/directives/connectionPermissionEditor.js    | 10 +++++-----
 guacamole/src/main/webapp/translations/en.json         | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/guacamole/src/main/webapp/app/manage/directives/connectionPermissionEditor.js b/guacamole/src/main/webapp/app/manage/directives/connectionPermissionEditor.js
index 8f1bec154..f47670a6e 100644
--- a/guacamole/src/main/webapp/app/manage/directives/connectionPermissionEditor.js
+++ b/guacamole/src/main/webapp/app/manage/directives/connectionPermissionEditor.js
@@ -111,12 +111,12 @@ angular.module('manage').directive('connectionPermissionEditor', ['$injector',
 
         /**
          * The name of the tab within the connection permission editor which
-         * displays readable connections only.
+         * displays currently selected (readable) connections only.
          *
          * @constant
          * @type String
          */
-        var SELECTED_CONNECTIONS = 'SELECTED_CONNECTIONS';
+        var CURRENT_CONNECTIONS = 'CURRENT_CONNECTIONS';
 
         /**
          * The name of the tab within the connection permission editor which
@@ -134,7 +134,7 @@ angular.module('manage').directive('connectionPermissionEditor', ['$injector',
          * @type String[]
          */
         $scope.tabs = [
-            SELECTED_CONNECTIONS,
+            CURRENT_CONNECTIONS,
             ALL_CONNECTIONS
         ];
 
@@ -174,7 +174,7 @@ angular.module('manage').directive('connectionPermissionEditor', ['$injector',
          *     root connection groups within those data sources.
          */
         $scope.getRootGroups = function getRootGroups() {
-            return $scope.currentTab === SELECTED_CONNECTIONS ? readableRootGroups : allRootGroups;
+            return $scope.currentTab === CURRENT_CONNECTIONS ? readableRootGroups : allRootGroups;
         };
 
         /**
@@ -344,7 +344,7 @@ angular.module('manage').directive('connectionPermissionEditor', ['$injector',
 
                 // Display only readable connections by default if at least one
                 // readable connection exists
-                $scope.currentTab = !!readableRootGroups[$scope.dataSource].children.length ? SELECTED_CONNECTIONS : ALL_CONNECTIONS;
+                $scope.currentTab = !!readableRootGroups[$scope.dataSource].children.length ? CURRENT_CONNECTIONS : ALL_CONNECTIONS;
 
             });
 
diff --git a/guacamole/src/main/webapp/translations/en.json b/guacamole/src/main/webapp/translations/en.json
index 83e1f58e3..d55e26225 100644
--- a/guacamole/src/main/webapp/translations/en.json
+++ b/guacamole/src/main/webapp/translations/en.json
@@ -303,11 +303,11 @@
 
         "INFO_READ_ONLY" : "Sorry, but this user account cannot be edited.",
 
-        "SECTION_HEADER_ALL_CONNECTIONS"      : "All Connections",
-        "SECTION_HEADER_CONNECTIONS"          : "Connections",
-        "SECTION_HEADER_EDIT_USER"            : "Edit User",
-        "SECTION_HEADER_PERMISSIONS"          : "Permissions",
-        "SECTION_HEADER_SELECTED_CONNECTIONS" : "Selected Connections",
+        "SECTION_HEADER_ALL_CONNECTIONS"     : "All Connections",
+        "SECTION_HEADER_CONNECTIONS"         : "Connections",
+        "SECTION_HEADER_CURRENT_CONNECTIONS" : "Current Connections",
+        "SECTION_HEADER_EDIT_USER"           : "Edit User",
+        "SECTION_HEADER_PERMISSIONS"         : "Permissions",
 
         "TEXT_CONFIRM_DELETE" : "Users cannot be restored after they have been deleted. Are you sure you want to delete this user?"