From 6a1128135520affd8e721011767f2b3b6938fcf9 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@splat.cc>
Date: Thu, 14 Feb 2019 20:25:50 -0500
Subject: [PATCH] Show last login along with the badges on the user view
 screen.

---
 awx/ui/client/legacy/styles/forms.less               | 12 ++++++++++++
 awx/ui/client/src/shared/form-generator.js           |  2 ++
 awx/ui/client/src/users/add/users-add.controller.js  |  1 +
 .../client/src/users/edit/users-edit.controller.js   |  1 +
 4 files changed, 16 insertions(+)

diff --git a/awx/ui/client/legacy/styles/forms.less b/awx/ui/client/legacy/styles/forms.less
index 9270be7c19..22cd14ac27 100644
--- a/awx/ui/client/legacy/styles/forms.less
+++ b/awx/ui/client/legacy/styles/forms.less
@@ -75,6 +75,18 @@
     text-transform: uppercase;
 }
 
+.Form-title--last_login {
+    border-radius: 5px;
+    color: @default-interface-txt;
+    font-size: 10px;
+    font-weight: 100;
+    height:15px;
+    margin-left: 10px;
+    margin-top: 2.25px;
+    padding: 0 10px;
+    text-transform: uppercase;
+}
+
 .Form-exitHolder {
     justify-content: flex-end;
     display:flex;
diff --git a/awx/ui/client/src/shared/form-generator.js b/awx/ui/client/src/shared/form-generator.js
index 4ba0f3890a..401a1f11f9 100644
--- a/awx/ui/client/src/shared/form-generator.js
+++ b/awx/ui/client/src/shared/form-generator.js
@@ -1418,6 +1418,8 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
                             "ng-show='ldap_user'>LDAP</span>";
                         html+= "<span class=\"Form-title--is_external_account\" "+
                             "ng-show='external_account'>{{external_account}}</span>";
+                        html+= "<span class=\"Form-title--last_login\" "+
+                            "ng-show='last_login'>" + i18n._("Last logged in: ") + "{{ last_login | longDate }}</span>";
                     }
                     if(this.form.name === "smartinventory"){
                         html+= "<span class=\"Form-title--is_smartinventory\" "+
diff --git a/awx/ui/client/src/users/add/users-add.controller.js b/awx/ui/client/src/users/add/users-add.controller.js
index 7cc98629ed..b6b1b3d035 100644
--- a/awx/ui/client/src/users/add/users-add.controller.js
+++ b/awx/ui/client/src/users/add/users-add.controller.js
@@ -35,6 +35,7 @@ export default ['$scope', '$rootScope', 'UserForm', 'GenerateForm', 'Rest',
             $scope.ldap_dn = null;
             $scope.socialAuthUser = false;
             $scope.external_account = null;
+            $scope.last_login = null;
 
             Rest.setUrl(GetBasePath('users'));
             Rest.options()
diff --git a/awx/ui/client/src/users/edit/users-edit.controller.js b/awx/ui/client/src/users/edit/users-edit.controller.js
index 5173b4a6e0..73682dafa7 100644
--- a/awx/ui/client/src/users/edit/users-edit.controller.js
+++ b/awx/ui/client/src/users/edit/users-edit.controller.js
@@ -52,6 +52,7 @@ export default ['$scope', '$rootScope', '$stateParams', 'UserForm', 'Rest',
             $scope.not_ldap_user = !$scope.ldap_user;
             master.ldap_user = $scope.ldap_user;
             $scope.socialAuthUser = (user_obj.auth.length > 0) ? true : false;
+            $scope.last_login = user_obj.last_login;
             $scope.external_account = user_obj.external_account;
 
             $scope.user_type = $scope.user_type_options[0];