From dc4217944d2a9e310ad0cd705d1264ada12b4831 Mon Sep 17 00:00:00 2001
From: Ken Hoes <khoes@ansible.com>
Date: Thu, 1 Dec 2016 11:56:07 -0500
Subject: [PATCH] Added custom info, fixed logout bug

---
 .../configuration/configuration.controller.js | 38 +++++++++++--------
 .../ui-form/configuration-ui.form.js          |  5 +++
 awx/ui/client/src/helpers/LoadConfig.js       | 12 +++++-
 .../login/loginModal/loginModal.controller.js |  1 -
 4 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/awx/ui/client/src/configuration/configuration.controller.js b/awx/ui/client/src/configuration/configuration.controller.js
index 83dbe483c2..fd5ddcc017 100644
--- a/awx/ui/client/src/configuration/configuration.controller.js
+++ b/awx/ui/client/src/configuration/configuration.controller.js
@@ -232,6 +232,29 @@ export default [
             }
         };
 
+        function loginUpdate() {
+            // Updates the logo and app config so that logos and info are properly shown
+            // on logout after modifying.
+            if($scope.CUSTOM_LOGO) {
+                $rootScope.custom_logo = $scope.CUSTOM_LOGO;
+                global.$AnsibleConfig.custom_logo = true;
+            } else {
+                $rootScope.custom_logo = '';
+                global.$AnsibleConfig.custom_logo = false;
+            }
+
+            if($scope.CUSTOM_LOGIN_INFO) {
+                $rootScope.custom_login_info = $scope.CUSTOM_LOGIN_INFO;
+                global.$AnsibleConfig.custom_login_info = $scope.CUSTOM_LOGIN_INFO;
+            } else {
+                $rootScope.custom_login_info = '';
+                global.$AnsibleConfig.custom_login_info = false;
+            }
+
+            Store('AnsibleConfig', global.$AnsibleConfig);
+
+            $scope.$broadcast('loginUpdated');
+        }
 
         $scope.resetValue = function(key) {
             Wait('start');
@@ -275,21 +298,6 @@ export default [
             }
         }
 
-        function loginUpdate() {
-            // Updates the logo and app config so that logos are properly shown
-            // on logout after modifying.
-            if($scope.CUSTOM_LOGO) {
-                $rootScope.custom_logo = $scope.$parent.CUSTOM_LOGO;
-                global.$AnsibleConfig.custom_logo = true;
-                Store('AnsibleConfig', global.$AnsibleConfig);
-            } else {
-                $rootScope.custom_logo = '';
-                global.$AnsibleConfig.custom_logo = false;
-                Store('AnsibleConfig', global.$AnsibleConfig);
-            }
-            $scope.$broadcast('loginUpdated');
-        }
-
         // Some dropdowns are listed as "list" type in the API even though they're a dropdown:
         var multiselectDropdowns = ['AD_HOC_COMMANDS'];
         var formSave = function() {
diff --git a/awx/ui/client/src/configuration/ui-form/configuration-ui.form.js b/awx/ui/client/src/configuration/ui-form/configuration-ui.form.js
index 0cd79fad9c..eb61885d95 100644
--- a/awx/ui/client/src/configuration/ui-form/configuration-ui.form.js
+++ b/awx/ui/client/src/configuration/ui-form/configuration-ui.form.js
@@ -22,6 +22,11 @@ export default function() {
                 reset: 'CUSTOM_LOGO',
                 control: `<image-upload key="CUSTOM_LOGO"></image-upload>`
             },
+            CUSTOM_LOGIN_INFO: {
+                type: 'textarea',
+                reset: 'CUSTOM_LOGIN_INFO',
+                rows: 6
+            }
         },
 
         buttons: {
diff --git a/awx/ui/client/src/helpers/LoadConfig.js b/awx/ui/client/src/helpers/LoadConfig.js
index c3ba75e4c7..a472c600a9 100644
--- a/awx/ui/client/src/helpers/LoadConfig.js
+++ b/awx/ui/client/src/helpers/LoadConfig.js
@@ -85,11 +85,19 @@ angular.module('LoadConfigHelper', ['Utilities'])
                     if(response.custom_logo) {
                         configSettings.custom_logo = true;
                         $rootScope.custom_logo = response.custom_logo;
-                        configInit();
                     } else {
                         configSettings.custom_logo = false;
-                        configInit();
                     }
+
+                    if(response.custom_login_info) {
+                        configSettings.custom_login_info = response.custom_login_info;
+                        $rootScope.custom_login_info = response.custom_login_info;
+                    } else {
+                        configSettings.custom_login_info = false;
+                    }
+
+                    configInit();
+
                 }).error(function(error) {
                     console.log(error);
                 });
diff --git a/awx/ui/client/src/login/loginModal/loginModal.controller.js b/awx/ui/client/src/login/loginModal/loginModal.controller.js
index 635ced3e20..1b064d4268 100644
--- a/awx/ui/client/src/login/loginModal/loginModal.controller.js
+++ b/awx/ui/client/src/login/loginModal/loginModal.controller.js
@@ -99,7 +99,6 @@ export default ['$log', '$cookieStore', '$compile', '$window', '$rootScope',
             scope.customLogo = "tower-logo-login.svg";
             scope.customLogoPresent = false;
         }
-
         scope.customLoginInfo = $AnsibleConfig.custom_login_info;
         scope.customLoginInfoPresent = (scope.customLoginInfo) ? true : false;
     });