External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-19 14:57:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Latest UI changes. Add button labels on all pages.

Browse Source
This commit is contained in:
chouseknecht
2013-05-24 07:43:06 -04:00
parent 8b919b666f
commit b4709c5138
33 changed files with 2351 additions and 518 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ansibleworks/ui/static/js/controllers/Inventories.js
View File

@@ -262,8 +262,8 @@ function InventoriesEdit ($scope, $rootScope, $compile, $location, $log, $routeP
TreeInit({ scope: scope, inventory: data });
// Initialize related search functions. Doing it here to make sure relatedSets object is populated.
RelatedSearchInit({ scope: scope, form: form, relatedSets: relatedSets });
RelatedPaginateInit({ scope: scope, relatedSets: relatedSets });
//RelatedSearchInit({ scope: scope, form: form, relatedSets: relatedSets });
//RelatedPaginateInit({ scope: scope, relatedSets: relatedSets });
scope.$emit('inventoryLoaded');
})
.error( function(data, status, headers, config) {

4
ansibleworks/ui/static/js/controllers/JobTemplates.js
View File

@@ -469,7 +469,7 @@ function JobTemplatesEdit ($scope, $rootScope, $compile, $location, $log, $route
})
.error( function(data, status, headers, config) {
ProcessErrors(scope, data, status, form,
{ hdr: 'Error!', msg: 'Failed to retrieve job template: ' + $routeParams.id + '. GET status: ' + status });
{ hdr: 'Error!', msg: 'Failed to retrieve job template: ' + $routeParams.id + '. GET status: ' + status });
});
// Save changes to the parent
@@ -491,7 +491,7 @@ function JobTemplatesEdit ($scope, $rootScope, $compile, $location, $log, $route
})
.error( function(data, status, headers, config) {
ProcessErrors(scope, data, status, form,
{ hdr: 'Error!', msg: 'Failed to update team: ' + $routeParams.id + '. PUT status: ' + status });
{ hdr: 'Error!', msg: 'Failed to update team: ' + $routeParams.id + '. PUT status: ' + status });
});
};

6
ansibleworks/ui/static/js/controllers/Jobs.js
View File

@@ -54,7 +54,7 @@ function JobsListCtrl ($scope, $rootScope, $location, $log, $routeParams, Rest,
var url, action_label, restcall, hdr;
if (data.status == 'pending') {
if (data.status == 'pending' || data.status == 'running') {
url = data.related.cancel;
action_label = 'cancel';
hdr = 'Cancel Job';
@@ -274,7 +274,7 @@ function JobsEdit ($scope, $rootScope, $compile, $location, $log, $routeParams,
// Save changes to the parent
scope.formSave = function() {
Rest.setUrl(defaultUrl + $routeParams.id);
Rest.setUrl(defaultUrl + $routeParams.id + '/');
var data = {}
for (var fld in form.fields) {
if (form.fields[fld].type == 'select' && fld != 'playbook') {
@@ -291,7 +291,7 @@ function JobsEdit ($scope, $rootScope, $compile, $location, $log, $routeParams,
})
.error( function(data, status, headers, config) {
ProcessErrors(scope, data, status, form,
{ hdr: 'Error!', msg: 'Failed to update team: ' + $routeParams.id + '. PUT status: ' + status });
{ hdr: 'Error!', msg: 'Failed to update job ' + $routeParams.id + '. PUT returned status: ' + status });
});
};

2
ansibleworks/ui/static/js/controllers/Teams.js
View File

@@ -276,7 +276,7 @@ function TeamsEdit ($scope, $rootScope, $compile, $location, $log, $routeParams,
// Save changes to the parent
scope.formSave = function() {
Rest.setUrl(defaultUrl + $routeParams.id);
Rest.setUrl(defaultUrl + $routeParams.id +'/');
var data = {}
for (var fld in form.fields) {
data[fld] = scope[fld];