External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-17 22:37:41 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3245 from wenottingham/we-meet-again-for-the-last-login-time

Browse Source 
[WIP] Show last login along with the badges on the user view screen.

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot]
2019-02-20 19:38:07 +00:00
committed by GitHub
parent 30352e375f 6a11281355
commit a9a2c1fa7b
4 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
awx/ui/client/legacy/styles/forms.less
View File

@@ -75,6 +75,18 @@
text-transform: uppercase; 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 { .Form-exitHolder {
justify-content: flex-end; justify-content: flex-end;
display:flex; display:flex;

2
awx/ui/client/src/shared/form-generator.js
View File

@@ -1418,6 +1418,8 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
"ng-show='ldap_user'>LDAP</span>"; "ng-show='ldap_user'>LDAP</span>";
html+= "<span class=\"Form-title--is_external_account\" "+ html+= "<span class=\"Form-title--is_external_account\" "+
"ng-show='external_account'>{{external_account}}</span>"; "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"){ if(this.form.name === "smartinventory"){
html+= "<span class=\"Form-title--is_smartinventory\" "+ html+= "<span class=\"Form-title--is_smartinventory\" "+

1
awx/ui/client/src/users/add/users-add.controller.js
View File

@@ -35,6 +35,7 @@ export default ['$scope', '$rootScope', 'UserForm', 'GenerateForm', 'Rest',
$scope.ldap_dn = null; $scope.ldap_dn = null;
$scope.socialAuthUser = false; $scope.socialAuthUser = false;
$scope.external_account = null; $scope.external_account = null;
$scope.last_login = null;
Rest.setUrl(GetBasePath('users')); Rest.setUrl(GetBasePath('users'));
Rest.options() Rest.options()

1
awx/ui/client/src/users/edit/users-edit.controller.js
View File

@@ -52,6 +52,7 @@ export default ['$scope', '$rootScope', '$stateParams', 'UserForm', 'Rest',
$scope.not_ldap_user = !$scope.ldap_user; $scope.not_ldap_user = !$scope.ldap_user;
master.ldap_user = $scope.ldap_user; master.ldap_user = $scope.ldap_user;
$scope.socialAuthUser = (user_obj.auth.length > 0) ? true : false; $scope.socialAuthUser = (user_obj.auth.length > 0) ? true : false;
$scope.last_login = user_obj.last_login;
$scope.external_account = user_obj.external_account; $scope.external_account = user_obj.external_account;
$scope.user_type = $scope.user_type_options[0]; $scope.user_type = $scope.user_type_options[0];