From 3df996f999e11b72526f0f982505bb67377e98aa Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 19 Jan 2015 10:56:10 -0500 Subject: [PATCH] Fix assorted UI error messages to reference the correct REST requests. Noticed when James commented on one specific posted error that it shouldn't be doing a PUT instead of a POST; turns out the error was just copy/pasted wrong. --- awx/ui/static/js/helpers/ConfigureTower.js | 2 +- awx/ui/static/js/helpers/CustomInventory.js | 4 ++-- awx/ui/static/js/helpers/Groups.js | 2 +- awx/ui/static/js/helpers/JobSubmission.js | 2 +- awx/ui/static/js/helpers/Survey.js | 4 ++-- awx/ui/static/js/helpers/inventory.js | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/awx/ui/static/js/helpers/ConfigureTower.js b/awx/ui/static/js/helpers/ConfigureTower.js index f136b05e4b..f6cdfce96f 100644 --- a/awx/ui/static/js/helpers/ConfigureTower.js +++ b/awx/ui/static/js/helpers/ConfigureTower.js @@ -181,7 +181,7 @@ angular.module('ConfigureTowerHelper', [ 'Utilities', 'RestServices', 'Schedules }) .error(function(data, status) { ProcessErrors(scope, data, status, null, { hdr: 'Error!', - msg: 'Failed updating job ' + scope.job_template_id + ' with variables. PUT returned: ' + status }); + msg: 'Failed updating job ' + scope.job_template_id + ' with variables. POST returned: ' + status }); }); }, "icon": "fa-rocket", diff --git a/awx/ui/static/js/helpers/CustomInventory.js b/awx/ui/static/js/helpers/CustomInventory.js index e4928b616a..a447ecc5cb 100644 --- a/awx/ui/static/js/helpers/CustomInventory.js +++ b/awx/ui/static/js/helpers/CustomInventory.js @@ -236,7 +236,7 @@ function($compile, SchedulerInit, Rest, Wait, CustomInventoryList, CustomInvento }) .error(function (data, status) { ProcessErrors(scope, data, status, form, { hdr: 'Error!', - msg: 'Failed to add new inventory script. Post returned status: ' + status }); + msg: 'Failed to add new inventory script. POST returned status: ' + status }); }); }; @@ -341,7 +341,7 @@ function($compile, CustomInventoryList, Rest, Wait, GenerateList, CustomInventor }) .error(function (data, status) { ProcessErrors(scope, data, status, form, { hdr: 'Error!', - msg: 'Failed to add new inventory script. Post returned status: ' + status }); + msg: 'Failed to add new inventory script. PUT returned status: ' + status }); }); }; diff --git a/awx/ui/static/js/helpers/Groups.js b/awx/ui/static/js/helpers/Groups.js index 9a7b1c2bab..6c240530b6 100644 --- a/awx/ui/static/js/helpers/Groups.js +++ b/awx/ui/static/js/helpers/Groups.js @@ -97,7 +97,7 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', ' .error(function (data, status) { ProcessErrors(scope, data, status, null, { hdr: 'Error!', msg: 'Failed to retrieve inventory source: ' + group.related.inventory_source + - ' POST returned status: ' + status }); + ' GET returned status: ' + status }); }); } } diff --git a/awx/ui/static/js/helpers/JobSubmission.js b/awx/ui/static/js/helpers/JobSubmission.js index e86ca1038b..5b65178856 100644 --- a/awx/ui/static/js/helpers/JobSubmission.js +++ b/awx/ui/static/js/helpers/JobSubmission.js @@ -101,7 +101,7 @@ angular.module('JobSubmissionHelper', [ 'RestServices', 'Utilities', 'Credential }) .error(function(data, status) { ProcessErrors(scope, data, status, null, { hdr: 'Error!', - msg: 'Failed updating job ' + scope.job_template_id + ' with variables. PUT returned: ' + status }); + msg: 'Failed updating job ' + scope.job_template_id + ' with variables. POST returned: ' + status }); }); }); diff --git a/awx/ui/static/js/helpers/Survey.js b/awx/ui/static/js/helpers/Survey.js index f03ac533ff..70897702a0 100644 --- a/awx/ui/static/js/helpers/Survey.js +++ b/awx/ui/static/js/helpers/Survey.js @@ -230,7 +230,7 @@ angular.module('SurveyHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper', }) .error(function (data, status) { ProcessErrors(scope, data, status, { hdr: 'Error!', - msg: 'Failed to add new survey. Post returned status: ' + status }); + msg: 'Failed to delete survey. DELETE returned status: ' + status }); }); } }; @@ -854,7 +854,7 @@ angular.module('SurveyHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper', }) .error(function (data, status) { ProcessErrors(scope, data, status, { hdr: 'Error!', - msg: 'Failed to add new survey. Post returned status: ' + status }); + msg: 'Failed to add new survey. POST returned status: ' + status }); }); } }; diff --git a/awx/ui/static/js/helpers/inventory.js b/awx/ui/static/js/helpers/inventory.js index c7c3184c6f..15a474016f 100644 --- a/awx/ui/static/js/helpers/inventory.js +++ b/awx/ui/static/js/helpers/inventory.js @@ -177,7 +177,7 @@ angular.module('InventoryHelper', ['RestServices', 'Utilities', 'OrganizationLis }) .error(function (data, status) { ProcessErrors(scope, data, status, form, { hdr: 'Error!', - msg: 'Failed to update inventory. POST returned status: ' + status }); + msg: 'Failed to update inventory. PUT returned status: ' + status }); }); }; }