From 9a0ac52ee157f772bbc78300147225db84b343ea Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Mon, 6 Apr 2015 22:02:14 -0700
Subject: [PATCH] GUAC-1126: Only display NAVIGATE_HOME_ACTION if the home page
 is not the current page.

---
 .../client/controllers/clientController.js    | 66 ++++++++++++-------
 1 file changed, 43 insertions(+), 23 deletions(-)

diff --git a/guacamole/src/main/webapp/app/client/controllers/clientController.js b/guacamole/src/main/webapp/app/client/controllers/clientController.js
index 188adcecc..7faa9c758 100644
--- a/guacamole/src/main/webapp/app/client/controllers/clientController.js
+++ b/guacamole/src/main/webapp/app/client/controllers/clientController.js
@@ -31,9 +31,10 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams
     var ScrollState        = $injector.get('ScrollState');
 
     // Required services
-    var $location          = $injector.get('$location');
-    var guacClientManager  = $injector.get('guacClientManager');
-    var guacNotification   = $injector.get('guacNotification');
+    var $location         = $injector.get('$location');
+    var guacClientManager = $injector.get('guacClientManager');
+    var guacNotification  = $injector.get('guacNotification');
+    var userPageService   = $injector.get('userPageService');
 
     /**
      * The minimum number of pixels a drag gesture must move to result in the
@@ -126,15 +127,27 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams
     };
 
     /**
-     * Action which returns the user to the home screen.
+     * Action which returns the user to the home screen. If the home page has
+     * not yet been determined, this will be null.
      */
-    var NAVIGATE_HOME_ACTION = {
-        name      : "CLIENT.ACTION_NAVIGATE_HOME",
-        className : "home button",
-        callback  : function navigateHomeCallback() {
-            $location.path('/');
+    var NAVIGATE_HOME_ACTION = null;
+
+    // Assign home page action once user's home page has been determined
+    userPageService.getHomePage()
+    .then(function homePageRetrieved(homePage) {
+
+        // Define home action only if different from current location
+        if ($location.path() !== homePage.url) {
+            NAVIGATE_HOME_ACTION = {
+                name      : "CLIENT.ACTION_NAVIGATE_HOME",
+                className : "home button",
+                callback  : function navigateHomeCallback() {
+                    $location.url(homePage.url);
+                }
+            };
         }
-    };
+
+    });
 
     /**
      * Action which replaces the current client with a newly-connected client.
@@ -414,6 +427,13 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams
         if (!connectionState)
             return;
 
+        // Build array of available actions
+        var actions;
+        if (NAVIGATE_HOME_ACTION)
+            actions = [ NAVIGATE_HOME_ACTION, RECONNECT_ACTION ];
+        else
+            actions = [ RECONNECT_ACTION ];
+
         // Get any associated status code
         var status = $scope.client.clientState.statusCode;
 
@@ -437,11 +457,11 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams
 
             // Show error status
             guacNotification.showStatus({
-                className: "error",
-                title: "CLIENT.DIALOG_HEADER_CONNECTION_ERROR",
-                text: "CLIENT.ERROR_CLIENT_" + errorName,
-                countdown: countdown,
-                actions: [ NAVIGATE_HOME_ACTION, RECONNECT_ACTION ]
+                className : "error",
+                title     : "CLIENT.DIALOG_HEADER_CONNECTION_ERROR",
+                text      : "CLIENT.ERROR_CLIENT_" + errorName,
+                countdown : countdown,
+                actions   : actions
             });
 
         }
@@ -457,11 +477,11 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams
 
             // Show error status
             guacNotification.showStatus({
-                className: "error",
-                title: "CLIENT.DIALOG_HEADER_CONNECTION_ERROR",
-                text: "CLIENT.ERROR_TUNNEL_" + errorName,
-                countdown: countdown,
-                actions: [ NAVIGATE_HOME_ACTION, RECONNECT_ACTION ]
+                className : "error",
+                title     : "CLIENT.DIALOG_HEADER_CONNECTION_ERROR",
+                text      : "CLIENT.ERROR_TUNNEL_" + errorName,
+                countdown : countdown,
+                actions   : actions
             });
 
         }
@@ -469,9 +489,9 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams
         // Disconnected
         else if (connectionState === ManagedClientState.ConnectionState.DISCONNECTED) {
             guacNotification.showStatus({
-                title: "CLIENT.DIALOG_HEADER_DISCONNECTED",
-                text: "CLIENT.TEXT_CLIENT_STATUS_" + connectionState.toUpperCase(),
-                actions: [ NAVIGATE_HOME_ACTION, RECONNECT_ACTION ]
+                title   : "CLIENT.DIALOG_HEADER_DISCONNECTED",
+                text    : "CLIENT.TEXT_CLIENT_STATUS_" + connectionState.toUpperCase(),
+                actions : actions
             });
         }