zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-05-05 16:01:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

AC-198 All username/password fields and all forms now have autocomplete='false' attribute to prevent browser autofill. Fixed Firefox password save prompt issue. Prompt was ~ 'Do you want to save password for <organization name>'. The prompt is now '...password for <username>'. The issue is the order of the fields. Prompt is build off of first field appearing before password field. Moved organization up and put username before password. Created an Angular approach to removing pre-selected class (the green success class) from a previously used list. Now lists won't appear to have pre-selected. This was kind of wokring with a jQuery approach now it's solid. New method applied to Users only. Will push to other modals shortly.

Browse Source
This commit is contained in:
chouseknecht
2013-07-12 13:46:38 -04:00
parent 3f2f0ebc59
commit 43fb2d7ae4
6 changed files with 349 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
awx/ui/static/js/controllers/Users.js
View File

@@ -12,13 +12,13 @@
function UsersList ($scope, $rootScope, $location, $log, $routeParams, Rest,
Alert, UserList, GenerateList, LoadBreadCrumbs, Prompt, SearchInit, PaginateInit,
ReturnToCaller, ClearScope, ProcessErrors)
ReturnToCaller, ClearScope, ProcessErrors, GetBasePath)
{
ClearScope('htmlTemplate'); //Garbage collection. Don't leave behind any listeners/watchers from the prior
//scope.
//scope.
var list = UserList;
var defaultUrl = '/api/v1/users/';
var defaultUrl = GetBasePath('users');
var view = GenerateList;
var base = $location.path().replace(/^\//,'').split('/')[0];
var mode = (base == 'users') ? 'edit' : 'select'; // if base path 'users', we're here to add/edit users
@@ -32,6 +32,16 @@ function UsersList ($scope, $rootScope, $location, $log, $routeParams, Rest,
LoadBreadCrumbs();
if (scope.PostRefreshRemove) {
scope.PostRefreshRemove();
}
scope.PostRefreshRemove = scope.$on('PostRefresh', function() {
// Remove the 'success' class, which makes green or selected rows, from each row
for (var i=0; i < scope[list.name].length; i++) {
scope[list.iterator + '_' + scope[list.name][i].id + '_class'] = '';
}
});
scope.addUser = function() {
$location.path($location.path() + '/add');
@@ -65,10 +75,14 @@ function UsersList ($scope, $rootScope, $location, $log, $routeParams, Rest,
}
scope.finishSelection = function() {
Rest.setUrl('/api/v1' + $location.path() + '/'); // We're assuming the path matches the api path.
// Will this always be true??
var url;
if (base == 'organizations') {
url = GetBasePath('organizations') + $routeParams.organization_id + '/users/';
}
else {
url = GetBasePath('teams') + $routeParams.team_id + '/users/';
}
scope.queue = [];
scope.$on('callFinished', function() {
// We call the API for each selected user. We need to hang out until all the api
// calls are finished.
@@ -101,6 +115,7 @@ function UsersList ($scope, $rootScope, $location, $log, $routeParams, Rest,
}
}
if (user !== null) {
Rest.setUrl(url);
Rest.post(user)
.success( function(data, status, headers, config) {
scope.queue.push({ result: 'success', data: data, status: status });
@@ -137,8 +152,8 @@ function UsersList ($scope, $rootScope, $location, $log, $routeParams, Rest,
}
UsersList.$inject = [ '$scope', '$rootScope', '$location', '$log', '$routeParams', 'Rest', 'Alert', 'UserList', 'GenerateList',
'LoadBreadCrumbs', 'Prompt', 'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope', 'ProcessErrors'
];
'LoadBreadCrumbs', 'Prompt', 'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope', 'ProcessErrors',
'GetBasePath' ];
function UsersAdd ($scope, $rootScope, $compile, $location, $log, $routeParams, UserForm,
@@ -182,26 +197,36 @@ function UsersAdd ($scope, $rootScope, $compile, $location, $log, $routeParams,
// Save
scope.formSave = function() {
Rest.setUrl(defaultUrl + scope.organization + '/users/');
var data = {}
for (var fld in form.fields) {
data[fld] = scope[fld];
}
Rest.post(data)
.success( function(data, status, headers, config) {
var base = $location.path().replace(/^\//,'').split('/')[0];
if (base == 'users') {
$rootScope.flashMessage = 'New user successfully created!';
$location.path('/users/' + data.id);
}
else {
ReturnToCaller(1);
}
})
.error( function(data, status, headers, config) {
ProcessErrors(scope, data, status, form,
{ hdr: 'Error!', msg: 'Failed to add new user. POST returned status: ' + status });
});
if (scope.organization !== undefined && scope.organization !== null && scope.organization !== '') {
Rest.setUrl(defaultUrl + scope.organization + '/users/');
var data = {}
for (var fld in form.fields) {
if (form.fields[fld].realName) {
data[form.fields[fld].realName] = scope[fld];
}
else {
data[fld] = scope[fld];
}
}
Rest.post(data)
.success( function(data, status, headers, config) {
var base = $location.path().replace(/^\//,'').split('/')[0];
if (base == 'users') {
$rootScope.flashMessage = 'New user successfully created!';
$location.path('/users/' + data.id);
}
else {
ReturnToCaller(1);
}
})
.error( function(data, status, headers, config) {
ProcessErrors(scope, data, status, form,
{ hdr: 'Error!', msg: 'Failed to add new user. POST returned status: ' + status });
});
}
else {
scope.organization_name_api_error = 'A value is required';
}
};
// Cancel