External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-24 14:36:00 -03:30
Code Issues Packages Projects Releases Wiki Activity

Automatically change instances of .success to .then with this linux script:

Browse Source 
#Run in awx/awx/ui/client/src

    #!/bin/bash -ex
    FILES=`grep -l -R "\.success(\s*function\s*(data)\s*{" . | xargs`
    sed -i "s/\.success(\s*function\s*(data)\s*{/\.then(({data}) => {/g" $FILES

    FILES=`grep -l -R "\.success(\s*function\s*()\s*{" . | xargs`
    sed -i "s/\.success(\s*function\s*()\s*{/\.then(() => {/g" $FILES

    FILES=`grep -l -R "\.success(this\.success\.bind(this))" . | xargs`
    sed -i "s/\.success(this\.success\.bind(this))/\.then(this\.then\.bind(this))/g" $FILES
This commit is contained in:
Ben Thomasson
2017-10-04 13:18:30 -04:00
committed by Marliana Lara
parent fabdab78ef
commit 834e6c692c
91 changed files with 194 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/client/src/access/permissions-list.controller.js
View File

@@ -21,7 +21,7 @@ export default ['$scope', 'ListDefinition', 'Dataset', 'Wait', 'Rest', 'ProcessE
Wait('start'); Wait('start');
Rest.setUrl(url); Rest.setUrl(url);
Rest.post({ "disassociate": true, "id": Number(userId) }) Rest.post({ "disassociate": true, "id": Number(userId) })
.success(function() { .then(() => {
Wait('stop'); Wait('stop');
$state.go('.', null, {reload: true}); $state.go('.', null, {reload: true});
}) })
@@ -54,7 +54,7 @@ export default ['$scope', 'ListDefinition', 'Dataset', 'Wait', 'Rest', 'ProcessE
Wait('start'); Wait('start');
Rest.setUrl(url); Rest.setUrl(url);
Rest.post({ "disassociate": true, "id": teamId }) Rest.post({ "disassociate": true, "id": teamId })
.success(function() { .then(() => {
Wait('stop'); Wait('stop');
$state.go('.', null, {reload: true}); $state.go('.', null, {reload: true});
}) })

2
awx/ui/client/src/access/rbac-role-column/roleList.directive.js
View File

@@ -53,7 +53,7 @@ export default
Rest.setUrl(url); Rest.setUrl(url);
Rest.post({ "disassociate": true, "id": entry.id }) Rest.post({ "disassociate": true, "id": entry.id })
.success(function() { .then(() => {
Wait('stop'); Wait('stop');
$state.go('.', null, { reload: true }); $state.go('.', null, { reload: true });
}) })

6
awx/ui/client/src/configuration/configuration.service.js
View File

@@ -15,7 +15,7 @@ export default ['$rootScope', 'GetBasePath', 'ProcessErrors', '$q', '$http', 'Re
Rest.setUrl(url); Rest.setUrl(url);
Rest.options() Rest.options()
.success(function(data) { .then(({data}) => {
// Compare GET actions with PUT actions and flag discrepancies // Compare GET actions with PUT actions and flag discrepancies
// for disabling in the UI // for disabling in the UI
var getActions = data.actions.GET; var getActions = data.actions.GET;
@@ -47,7 +47,7 @@ export default ['$rootScope', 'GetBasePath', 'ProcessErrors', '$q', '$http', 'Re
Rest.setUrl(url); Rest.setUrl(url);
Rest.patch(body) Rest.patch(body)
.success(function(data) { .then(({data}) => {
deferred.resolve(data); deferred.resolve(data);
}) })
.error(function(error) { .error(function(error) {
@@ -61,7 +61,7 @@ export default ['$rootScope', 'GetBasePath', 'ProcessErrors', '$q', '$http', 'Re
var deferred = $q.defer(); var deferred = $q.defer();
Rest.setUrl(url); Rest.setUrl(url);
Rest.get() Rest.get()
.success(function(data) { .then(({data}) => {
deferred.resolve(data); deferred.resolve(data);
}) })
.error(function(error) { .error(function(error) {

2
awx/ui/client/src/credential-types/add/add.controller.js
View File

@@ -99,7 +99,7 @@ export default ['Rest', 'Wait',
inputs: inputs, inputs: inputs,
injectors: injectors injectors: injectors
}) })
.success(function(data) { .then(({data}) => {
$state.go('credentialTypes.edit', { credential_type_id: data.id }, { reload: true }); $state.go('credentialTypes.edit', { credential_type_id: data.id }, { reload: true });
Wait('stop'); Wait('stop');
}) })

2
awx/ui/client/src/credential-types/edit/edit.controller.js
View File

@@ -173,7 +173,7 @@ export default ['Rest', 'Wait',
inputs: inputs, inputs: inputs,
injectors: injectors injectors: injectors
}) })
.success(function() { .then(() => {
$state.go($state.current, null, { reload: true }); $state.go($state.current, null, { reload: true });
Wait('stop'); Wait('stop');
}) })

2
awx/ui/client/src/credential-types/list/list.controller.js
View File

@@ -60,7 +60,7 @@ export default ['$rootScope', '$scope', 'Wait', 'CredentialTypesList',
var url = defaultUrl + id + '/'; var url = defaultUrl + id + '/';
Rest.setUrl(url); Rest.setUrl(url);
Rest.destroy() Rest.destroy()
.success(function() { .then(() => {
let reloadListStateParams = null; let reloadListStateParams = null;

4
awx/ui/client/src/credentials/factories/credential-form-save.factory.js
View File

@@ -51,7 +51,7 @@ export default
url = GetBasePath("credentials"); url = GetBasePath("credentials");
Rest.setUrl(url); Rest.setUrl(url);
Rest.post(data) Rest.post(data)
.success(function (data) { .then(({data}) => {
scope.addedItem = data.id; scope.addedItem = data.id;
Wait('stop'); Wait('stop');
@@ -83,7 +83,7 @@ export default
url = GetBasePath('credentials') + scope.id + '/'; url = GetBasePath('credentials') + scope.id + '/';
Rest.setUrl(url); Rest.setUrl(url);
Rest.put(data) Rest.put(data)
.success(function () { .then(() => {
Wait('stop'); Wait('stop');
$state.go($state.current, {}, {reload: true}); $state.go($state.current, {}, {reload: true});
}) })

2
awx/ui/client/src/credentials/list/credentials-list.controller.js
View File

@@ -85,7 +85,7 @@ export default ['$scope', 'Rest', 'CredentialList', 'Prompt', 'ProcessErrors', '
var url = defaultUrl + id + '/'; var url = defaultUrl + id + '/';
Rest.setUrl(url); Rest.setUrl(url);
Rest.destroy() Rest.destroy()
.success(function() { .then(() => {
let reloadListStateParams = null; let reloadListStateParams = null;

12
awx/ui/client/src/home/home.controller.js
View File

@@ -14,7 +14,7 @@ export default ['$scope', '$rootScope','Wait',
$scope.$on('ws-jobs', function () { $scope.$on('ws-jobs', function () {
Rest.setUrl(GetBasePath('dashboard')); Rest.setUrl(GetBasePath('dashboard'));
Rest.get() Rest.get()
.success(function (data) { .then(({data}) => {
$scope.dashboardData = data; $scope.dashboardData = data;
}) })
.error(function (data, status) { .error(function (data, status) {
@@ -23,7 +23,7 @@ export default ['$scope', '$rootScope','Wait',
Rest.setUrl(GetBasePath("unified_jobs") + "?order_by=-finished&page_size=5&finished__isnull=false&type=workflow_job,job"); Rest.setUrl(GetBasePath("unified_jobs") + "?order_by=-finished&page_size=5&finished__isnull=false&type=workflow_job,job");
Rest.get() Rest.get()
.success(function (data) { .then(({data}) => {
$scope.dashboardJobsListData = data.results; $scope.dashboardJobsListData = data.results;
}) })
.error(function (data, status) { .error(function (data, status) {
@@ -32,7 +32,7 @@ export default ['$scope', '$rootScope','Wait',
Rest.setUrl(GetBasePath("unified_job_templates") + "?order_by=-last_job_run&page_size=5&last_job_run__isnull=false&type=workflow_job_template,job_template"); Rest.setUrl(GetBasePath("unified_job_templates") + "?order_by=-last_job_run&page_size=5&last_job_run__isnull=false&type=workflow_job_template,job_template");
Rest.get() Rest.get()
.success(function (data) { .then(({data}) => {
$scope.dashboardJobTemplatesListData = data.results; $scope.dashboardJobTemplatesListData = data.results;
}) })
.error(function (data, status) { .error(function (data, status) {
@@ -90,7 +90,7 @@ export default ['$scope', '$rootScope','Wait',
Wait('start'); Wait('start');
Rest.setUrl(GetBasePath('dashboard')); Rest.setUrl(GetBasePath('dashboard'));
Rest.get() Rest.get()
.success(function (data) { .then(({data}) => {
$scope.dashboardData = data; $scope.dashboardData = data;
$scope.$emit('dashboardReady', data); $scope.$emit('dashboardReady', data);
}) })
@@ -99,7 +99,7 @@ export default ['$scope', '$rootScope','Wait',
}); });
Rest.setUrl(GetBasePath("unified_jobs") + "?order_by=-finished&page_size=5&finished__isnull=false&type=workflow_job,job"); Rest.setUrl(GetBasePath("unified_jobs") + "?order_by=-finished&page_size=5&finished__isnull=false&type=workflow_job,job");
Rest.get() Rest.get()
.success(function (data) { .then(({data}) => {
data = data.results; data = data.results;
$scope.$emit('dashboardJobsListReady', data); $scope.$emit('dashboardJobsListReady', data);
}) })
@@ -108,7 +108,7 @@ export default ['$scope', '$rootScope','Wait',
}); });
Rest.setUrl(GetBasePath("unified_job_templates") + "?order_by=-last_job_run&page_size=5&last_job_run__isnull=false&type=workflow_job_template,job_template"); Rest.setUrl(GetBasePath("unified_job_templates") + "?order_by=-last_job_run&page_size=5&last_job_run__isnull=false&type=workflow_job_template,job_template");
Rest.get() Rest.get()
.success(function (data) { .then(({data}) => {
data = data.results; data = data.results;
$scope.$emit('dashboardJobTemplatesListReady', data); $scope.$emit('dashboardJobTemplatesListReady', data);
}) })

2
awx/ui/client/src/inventories-hosts/inventories/adhoc/adhoc.controller.js
View File

@@ -239,7 +239,7 @@ function adhocController($q, $scope, $stateParams,
// Launch the adhoc job // Launch the adhoc job
Rest.setUrl(GetBasePath('inventory') + id + '/ad_hoc_commands/'); Rest.setUrl(GetBasePath('inventory') + id + '/ad_hoc_commands/');
Rest.post(data) Rest.post(data)
.success(function (data) { .then(({data}) => {
Wait('stop'); Wait('stop');
$state.go('adHocJobStdout', {id: data.id}); $state.go('adHocJobStdout', {id: data.id});
}) })

2
awx/ui/client/src/inventories-hosts/inventories/list/host-summary-popover/host-summary-popover.controller.js
View File

@@ -10,7 +10,7 @@ export default [ '$scope', 'Empty', 'Wait', 'GetBasePath', 'Rest', 'ProcessError
url += "&order_by=-finished&page_size=5"; url += "&order_by=-finished&page_size=5";
Rest.setUrl(url); Rest.setUrl(url);
Rest.get() Rest.get()
.success( function(data) { .then(({data}) => {
$scope.generateTable(data, event); $scope.generateTable(data, event);
}) })
.error( function(data, status) { .error( function(data, status) {

2
awx/ui/client/src/inventories-hosts/inventories/list/inventory-list.controller.js
View File

@@ -85,7 +85,7 @@ function InventoriesList($scope,
$('#prompt-modal').modal('hide'); $('#prompt-modal').modal('hide');
Rest.setUrl(url); Rest.setUrl(url);
Rest.destroy() Rest.destroy()
.success(function () { .then(() => {
Wait('stop'); Wait('stop');
}) })
.error(function (data, status) { .error(function (data, status) {

2
awx/ui/client/src/inventories-hosts/inventories/list/source-summary-popover/source-summary-popover.controller.js
View File

@@ -6,7 +6,7 @@ export default [ '$scope', 'Wait', 'Empty', 'Rest', 'ProcessErrors', '$state',
Wait('start'); Wait('start');
Rest.setUrl($scope.inventory.related.inventory_sources + '?order_by=-last_job_run&page_size=5'); Rest.setUrl($scope.inventory.related.inventory_sources + '?order_by=-last_job_run&page_size=5');
Rest.get() Rest.get()
.success(function(data) { .then(({data}) => {
$scope.generateTable(data, event); $scope.generateTable(data, event);
}) })
.error(function(data, status) { .error(function(data, status) {

6
awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-groups-labels/relatedGroupsLabelsList.directive.js
View File

@@ -22,7 +22,7 @@ export default
var getNext = function(data, arr, resolve) { var getNext = function(data, arr, resolve) {
Rest.setUrl(data.next); Rest.setUrl(data.next);
Rest.get() Rest.get()
.success(function (data) { .then(({data}) => {
if (data.next) { if (data.next) {
getNext(data, arr.concat(data.results), resolve); getNext(data, arr.concat(data.results), resolve);
} else { } else {
@@ -35,7 +35,7 @@ export default
var seeMoreResolve = $q.defer(); var seeMoreResolve = $q.defer();
Rest.setUrl(`${scope[scope.$parent.list.iterator].related.groups}?order_by=id`); Rest.setUrl(`${scope[scope.$parent.list.iterator].related.groups}?order_by=id`);
Rest.get() Rest.get()
.success(function(data) { .then(({data}) => {
if (data.next) { if (data.next) {
getNext(data, data.results, seeMoreResolve); getNext(data, data.results, seeMoreResolve);
} else { } else {
@@ -65,7 +65,7 @@ export default
if(url) { if(url) {
Rest.setUrl(url); Rest.setUrl(url);
Rest.post({"disassociate": true, "id": host.id}) Rest.post({"disassociate": true, "id": host.id})
.success(function () { .then(() => {
Wait('stop'); Wait('stop');
$state.go('.', null, {reload: true}); $state.go('.', null, {reload: true});
}) })

2
awx/ui/client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js
View File

@@ -36,7 +36,7 @@ export default ['$state', '$stateParams', '$scope', 'SourcesFormDefinition',
Wait('start'); Wait('start');
Rest.setUrl(url); Rest.setUrl(url);
Rest.get() Rest.get()
.success(function (data) { .then(({data}) => {
$scope.inventory_files = data; $scope.inventory_files = data;
$scope.inventory_files.push("/ (project root)"); $scope.inventory_files.push("/ (project root)");
sync_inventory_file_select2(); sync_inventory_file_select2();

2
awx/ui/client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js
View File

@@ -116,7 +116,7 @@ export default ['$state', '$stateParams', '$scope', 'ParseVariableString',
Wait('start'); Wait('start');
Rest.setUrl(url); Rest.setUrl(url);
Rest.get() Rest.get()
.success(function (data) { .then(({data}) => {
$scope.inventory_files = data; $scope.inventory_files = data;
$scope.inventory_files.push("/ (project root)"); $scope.inventory_files.push("/ (project root)");

6
awx/ui/client/src/inventories-hosts/inventories/related/sources/factories/cancel-source-update.factory.js
View File

@@ -16,18 +16,18 @@ export default
Wait('start'); Wait('start');
Rest.setUrl(inventory_source.url); Rest.setUrl(inventory_source.url);
Rest.get() Rest.get()
.success(function (data) { .then(({data}) => {
// Check that we have access to cancelling an update // Check that we have access to cancelling an update
var url = (data.related.current_update) ? data.related.current_update : data.related.last_update; var url = (data.related.current_update) ? data.related.current_update : data.related.last_update;
url += 'cancel/'; url += 'cancel/';
Rest.setUrl(url); Rest.setUrl(url);
Rest.get() Rest.get()
.success(function (data) { .then(({data}) => {
if (data.can_cancel) { if (data.can_cancel) {
// Cancel the update process // Cancel the update process
Rest.setUrl(url); Rest.setUrl(url);
Rest.post() Rest.post()
.success(function () { .then(() => {
Wait('stop'); Wait('stop');
//Alert('Inventory Sync Cancelled', 'Request to cancel the sync process was submitted to the task manger. ' + //Alert('Inventory Sync Cancelled', 'Request to cancel the sync process was submitted to the task manger. ' +
// 'Click the <i class="fa fa-refresh fa-lg"></i> button to monitor the status.', 'alert-info'); // 'Click the <i class="fa fa-refresh fa-lg"></i> button to monitor the status.', 'alert-info');

2
awx/ui/client/src/inventories-hosts/inventories/related/sources/factories/get-source-type-options.factory.js
View File

@@ -8,7 +8,7 @@ export default
scope[variable] = []; scope[variable] = [];
Rest.setUrl(GetBasePath('inventory_sources')); Rest.setUrl(GetBasePath('inventory_sources'));
Rest.options() Rest.options()
.success(function (data) { .then(({data}) => {
var i, choices = data.actions.GET.source.choices; var i, choices = data.actions.GET.source.choices;
for (i = 0; i < choices.length; i++) { for (i = 0; i < choices.length; i++) {
if (choices[i][0] !== 'file' && choices[i][0] !== "") { if (choices[i][0] !== 'file' && choices[i][0] !== "") {

2
awx/ui/client/src/inventories-hosts/inventories/related/sources/factories/view-update-status.factory.js
View File

@@ -13,7 +13,7 @@ export default
Wait('start'); Wait('start');
Rest.setUrl(inventory_source.url); Rest.setUrl(inventory_source.url);
Rest.get() Rest.get()
.success(function (data) { .then(({data}) => {
// Get the ID from the correct summary field // Get the ID from the correct summary field
var update_id = (data.summary_fields.current_update) ? data.summary_fields.current_update.id : data.summary_fields.last_update.id; var update_id = (data.summary_fields.current_update) ? data.summary_fields.current_update.id : data.summary_fields.last_update.id;

22
awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.service.js
View File

@@ -23,7 +23,7 @@ export default
this.url = GetBasePath('inventory_sources') + '?' + this.stringifyParams(params); this.url = GetBasePath('inventory_sources') + '?' + this.stringifyParams(params);
Rest.setUrl(this.url); Rest.setUrl(this.url);
return Rest.get() return Rest.get()
.success(this.success.bind(this)) .then(this.then.bind(this))
.error(this.error.bind(this)) .error(this.error.bind(this))
.finally(Wait('stop')); .finally(Wait('stop'));
}, },
@@ -32,7 +32,7 @@ export default
this.url = GetBasePath('inventory_sources'); this.url = GetBasePath('inventory_sources');
Rest.setUrl(this.url); Rest.setUrl(this.url);
return Rest.post(inventory_source) return Rest.post(inventory_source)
.success(this.success.bind(this)) .then(this.then.bind(this))
.error(this.error.bind(this)) .error(this.error.bind(this))
.finally(Wait('stop')); .finally(Wait('stop'));
}, },
@@ -41,7 +41,7 @@ export default
this.url = GetBasePath('inventory_sources') + inventory_source.id; this.url = GetBasePath('inventory_sources') + inventory_source.id;
Rest.setUrl(this.url); Rest.setUrl(this.url);
return Rest.put(inventory_source) return Rest.put(inventory_source)
.success(this.success.bind(this)) .then(this.then.bind(this))
.error(this.error.bind(this)) .error(this.error.bind(this))
.finally(Wait('stop')); .finally(Wait('stop'));
}, },
@@ -50,7 +50,7 @@ export default
this.url = GetBasePath('inventory_sources') + id; this.url = GetBasePath('inventory_sources') + id;
Rest.setUrl(this.url); Rest.setUrl(this.url);
return Rest.destroy() return Rest.destroy()
.success(this.success.bind(this)) .then(this.then.bind(this))
.error(this.error.bind(this)) .error(this.error.bind(this))
.finally(Wait('stop')); .finally(Wait('stop'));
}, },
@@ -58,7 +58,7 @@ export default
this.url = GetBasePath('inventory_sources'); this.url = GetBasePath('inventory_sources');
Rest.setUrl(this.url); Rest.setUrl(this.url);
return Rest.options() return Rest.options()
.success(this.success.bind(this)) .then(this.then.bind(this))
.error(this.error.bind(this)); .error(this.error.bind(this));
}, },
getCredential: function(id){ getCredential: function(id){
@@ -66,7 +66,7 @@ export default
this.url = GetBasePath('credentials') + id; this.url = GetBasePath('credentials') + id;
Rest.setUrl(this.url); Rest.setUrl(this.url);
return Rest.get() return Rest.get()
.success(this.success.bind(this)) .then(this.then.bind(this))
.error(this.error.bind(this)) .error(this.error.bind(this))
.finally(Wait('stop')); .finally(Wait('stop'));
}, },
@@ -75,7 +75,7 @@ export default
this.url = GetBasePath('inventory_sources') + '?' + this.stringifyParams(params); this.url = GetBasePath('inventory_sources') + '?' + this.stringifyParams(params);
Rest.setUrl(this.url); Rest.setUrl(this.url);
return Rest.get() return Rest.get()
.success(this.success.bind(this)) .then(this.then.bind(this))
.error(this.error.bind(this)) .error(this.error.bind(this))
.finally(Wait('stop')); .finally(Wait('stop'));
}, },
@@ -84,7 +84,7 @@ export default
this.url = url; this.url = url;
Rest.setUrl(this.url); Rest.setUrl(this.url);
return Rest.put(params) return Rest.put(params)
.success(this.success.bind(this)) .then(this.then.bind(this))
.error(this.error.bind(this)) .error(this.error.bind(this))
.finally(Wait('stop')); .finally(Wait('stop'));
}, },
@@ -94,7 +94,7 @@ export default
this.url = GetBasePath('groups') + target + '/children/'; this.url = GetBasePath('groups') + target + '/children/';
Rest.setUrl(this.url); Rest.setUrl(this.url);
return Rest.post(group) return Rest.post(group)
.success(this.success.bind(this)) .then(this.then.bind(this))
.error(this.error.bind(this)) .error(this.error.bind(this))
.finally(Wait('stop')); .finally(Wait('stop'));
}, },
@@ -103,7 +103,7 @@ export default
this.url = GetBasePath('groups') + parent + '/children/'; this.url = GetBasePath('groups') + parent + '/children/';
Rest.setUrl(this.url); Rest.setUrl(this.url);
return Rest.post({id: group, disassociate: 1}) return Rest.post({id: group, disassociate: 1})
.success(this.success.bind(this)) .then(this.then.bind(this))
.error(this.error.bind(this)) .error(this.error.bind(this))
.finally(Wait('stop')); .finally(Wait('stop'));
}, },
@@ -112,7 +112,7 @@ export default
this.url = GetBasePath('inventory') + inventory + '/groups/'; this.url = GetBasePath('inventory') + inventory + '/groups/';
Rest.setUrl(this.url); Rest.setUrl(this.url);
return Rest.post({id: group, disassociate: 1}) return Rest.post({id: group, disassociate: 1})
.success(this.success.bind(this)) .then(this.then.bind(this))
.error(this.error.bind(this)) .error(this.error.bind(this))
.finally(Wait('stop')); .finally(Wait('stop'));
}, },

2
awx/ui/client/src/inventories-hosts/inventories/smart-inventory/add/smart-inventory-add.controller.js
View File

@@ -60,7 +60,7 @@ function SmartInventoryAdd($scope, $location,
Rest.setUrl(defaultUrl); Rest.setUrl(defaultUrl);
Rest.post(data) Rest.post(data)
.success(function(data) { .then(({data}) => {
const inventory_id = data.id, const inventory_id = data.id,
instance_group_url = data.related.instance_groups; instance_group_url = data.related.instance_groups;

2
awx/ui/client/src/inventories-hosts/inventories/smart-inventory/edit/smart-inventory-edit.controller.js
View File

@@ -77,7 +77,7 @@ function SmartInventoryEdit($scope, $location,
Rest.setUrl(defaultUrl + inventory_id + '/'); Rest.setUrl(defaultUrl + inventory_id + '/');
Rest.put(data) Rest.put(data)
.success(function() { .then(() => {
InstanceGroupsService.editInstanceGroups(instance_group_url, $scope.instance_groups) InstanceGroupsService.editInstanceGroups(instance_group_url, $scope.instance_groups)
.then(() => { .then(() => {
Wait('stop'); Wait('stop');

2
awx/ui/client/src/inventories-hosts/shared/ansible-facts/ansible-facts.route.js
View File

@@ -18,7 +18,7 @@ export default {
let ansibleFactsUrl = GetBasePath('hosts') + $stateParams.host_id + '/ansible_facts'; let ansibleFactsUrl = GetBasePath('hosts') + $stateParams.host_id + '/ansible_facts';
Rest.setUrl(ansibleFactsUrl); Rest.setUrl(ansibleFactsUrl);
return Rest.get() return Rest.get()
.success(function(data) { .then(({data}) => {
return data; return data;
}); });
} }

24
awx/ui/client/src/inventories-hosts/shared/groups.service.js
View File

@@ -23,7 +23,7 @@ export default
this.url = GetBasePath('groups') + '?' + this.stringifyParams(params); this.url = GetBasePath('groups') + '?' + this.stringifyParams(params);
Rest.setUrl(this.url); Rest.setUrl(this.url);
return Rest.get() return Rest.get()
.success(this.success.bind(this)) .then(this.then.bind(this))
.error(this.error.bind(this)) .error(this.error.bind(this))
.finally(Wait('stop')); .finally(Wait('stop'));
}, },
@@ -32,7 +32,7 @@ export default
this.url = GetBasePath('groups'); this.url = GetBasePath('groups');
Rest.setUrl(this.url); Rest.setUrl(this.url);
return Rest.post(group) return Rest.post(group)
.success(this.success.bind(this)) .then(this.then.bind(this))
.error(this.error.bind(this)) .error(this.error.bind(this))
.finally(Wait('stop')); .finally(Wait('stop'));
}, },
@@ -41,7 +41,7 @@ export default
this.url = GetBasePath('groups') + group.id; this.url = GetBasePath('groups') + group.id;
Rest.setUrl(this.url); Rest.setUrl(this.url);
return Rest.put(group) return Rest.put(group)
.success(this.success.bind(this)) .then(this.then.bind(this))
.error(this.error.bind(this)) .error(this.error.bind(this))
.finally(Wait('stop')); .finally(Wait('stop'));
}, },
@@ -50,7 +50,7 @@ export default
this.url = GetBasePath('groups') + id; this.url = GetBasePath('groups') + id;
Rest.setUrl(this.url); Rest.setUrl(this.url);
return Rest.destroy() return Rest.destroy()
.success(this.success.bind(this)) .then(this.then.bind(this))
.error(this.error.bind(this)) .error(this.error.bind(this))
.finally(Wait('stop')); .finally(Wait('stop'));
}, },
@@ -59,7 +59,7 @@ export default
this.url = GetBasePath('credentials') + id; this.url = GetBasePath('credentials') + id;
Rest.setUrl(this.url); Rest.setUrl(this.url);
return Rest.get() return Rest.get()
.success(this.success.bind(this)) .then(this.then.bind(this))
.error(this.error.bind(this)) .error(this.error.bind(this))
.finally(Wait('stop')); .finally(Wait('stop'));
}, },
@@ -68,7 +68,7 @@ export default
this.url = GetBasePath('inventory_sources') + '?' + this.stringifyParams(params); this.url = GetBasePath('inventory_sources') + '?' + this.stringifyParams(params);
Rest.setUrl(this.url); Rest.setUrl(this.url);
return Rest.get() return Rest.get()
.success(this.success.bind(this)) .then(this.then.bind(this))
.error(this.error.bind(this)) .error(this.error.bind(this))
.finally(Wait('stop')); .finally(Wait('stop'));
}, },
@@ -77,7 +77,7 @@ export default
this.url = url; this.url = url;
Rest.setUrl(this.url); Rest.setUrl(this.url);
return Rest.put(params) return Rest.put(params)
.success(this.success.bind(this)) .then(this.then.bind(this))
.error(this.error.bind(this)) .error(this.error.bind(this))
.finally(Wait('stop')); .finally(Wait('stop'));
}, },
@@ -87,7 +87,7 @@ export default
this.url = GetBasePath('groups') + target + '/children/'; this.url = GetBasePath('groups') + target + '/children/';
Rest.setUrl(this.url); Rest.setUrl(this.url);
return Rest.post(group) return Rest.post(group)
.success(this.success.bind(this)) .then(this.then.bind(this))
.error(this.error.bind(this)) .error(this.error.bind(this))
.finally(Wait('stop')); .finally(Wait('stop'));
}, },
@@ -96,7 +96,7 @@ export default
this.url = GetBasePath('groups') + parent + '/children/'; this.url = GetBasePath('groups') + parent + '/children/';
Rest.setUrl(this.url); Rest.setUrl(this.url);
return Rest.post({id: group, disassociate: 1}) return Rest.post({id: group, disassociate: 1})
.success(this.success.bind(this)) .then(this.then.bind(this))
.error(this.error.bind(this)) .error(this.error.bind(this))
.finally(Wait('stop')); .finally(Wait('stop'));
}, },
@@ -105,7 +105,7 @@ export default
this.url = GetBasePath('groups') + target + '/hosts/'; this.url = GetBasePath('groups') + target + '/hosts/';
Rest.setUrl(this.url); Rest.setUrl(this.url);
return Rest.post(host) return Rest.post(host)
.success(this.success.bind(this)) .then(this.then.bind(this))
.error(this.error.bind(this)) .error(this.error.bind(this))
.finally(Wait('stop')); .finally(Wait('stop'));
}, },
@@ -114,7 +114,7 @@ export default
this.url = GetBasePath('groups') + group + '/hosts/'; this.url = GetBasePath('groups') + group + '/hosts/';
Rest.setUrl(this.url); Rest.setUrl(this.url);
return Rest.post({id: host, disassociate: 1}) return Rest.post({id: host, disassociate: 1})
.success(this.success.bind(this)) .then(this.then.bind(this))
.error(this.error.bind(this)) .error(this.error.bind(this))
.finally(Wait('stop')); .finally(Wait('stop'));
}, },
@@ -123,7 +123,7 @@ export default
this.url = GetBasePath('inventory') + inventory + '/groups/'; this.url = GetBasePath('inventory') + inventory + '/groups/';
Rest.setUrl(this.url); Rest.setUrl(this.url);
return Rest.post({id: group, disassociate: 1}) return Rest.post({id: group, disassociate: 1})
.success(this.success.bind(this)) .then(this.then.bind(this))
.error(this.error.bind(this)) .error(this.error.bind(this))
.finally(Wait('stop')); .finally(Wait('stop'));
} }

8
awx/ui/client/src/inventories-hosts/shared/hosts.service.js
View File

@@ -30,7 +30,7 @@
this.url = GetBasePath('hosts') + '?' + this.stringifyParams(params); this.url = GetBasePath('hosts') + '?' + this.stringifyParams(params);
Rest.setUrl(this.url); Rest.setUrl(this.url);
return Rest.get() return Rest.get()
.success(this.success.bind(this)) .then(this.then.bind(this))
.error(this.error.bind(this)) .error(this.error.bind(this))
.finally(Wait('stop')); .finally(Wait('stop'));
}, },
@@ -39,7 +39,7 @@
this.url = GetBasePath('hosts'); this.url = GetBasePath('hosts');
Rest.setUrl(this.url); Rest.setUrl(this.url);
return Rest.post(host) return Rest.post(host)
.success(this.success.bind(this)) .then(this.then.bind(this))
.error(this.error.bind(this)) .error(this.error.bind(this))
.finally(Wait('stop')); .finally(Wait('stop'));
}, },
@@ -48,7 +48,7 @@
this.url = GetBasePath('hosts') + host.id; this.url = GetBasePath('hosts') + host.id;
Rest.setUrl(this.url); Rest.setUrl(this.url);
return Rest.put(host) return Rest.put(host)
.success(this.success.bind(this)) .then(this.then.bind(this))
.error(this.error.bind(this)) .error(this.error.bind(this))
.finally(Wait('stop')); .finally(Wait('stop'));
}, },
@@ -57,7 +57,7 @@
this.url = GetBasePath('hosts') + id; this.url = GetBasePath('hosts') + id;
Rest.setUrl(this.url); Rest.setUrl(this.url);
return Rest.destroy() return Rest.destroy()
.success(this.success.bind(this)) .then(this.then.bind(this))
.error(this.error.bind(this)) .error(this.error.bind(this))
.finally(Wait('stop')); .finally(Wait('stop'));
} }

10
awx/ui/client/src/inventories-hosts/shared/inventories.service.js
View File

@@ -25,7 +25,7 @@
this.url = GetBasePath('inventory') + id; this.url = GetBasePath('inventory') + id;
Rest.setUrl(this.url); Rest.setUrl(this.url);
return Rest.get() return Rest.get()
.success(this.success.bind(this)) .then(this.then.bind(this))
.error(this.error.bind(this)) .error(this.error.bind(this))
.finally(Wait('stop')); .finally(Wait('stop'));
}, },
@@ -36,7 +36,7 @@
}).join(''); }).join('');
Rest.setUrl(this.url); Rest.setUrl(this.url);
return Rest.get() return Rest.get()
.success(this.success.bind(this)) .then(this.then.bind(this))
.error(this.error.bind(this)) .error(this.error.bind(this))
.finally(Wait('stop')); .finally(Wait('stop'));
}, },
@@ -60,21 +60,21 @@
this.url = GetBasePath('inventory') + inventoryId + '/inventory_sources'; this.url = GetBasePath('inventory') + inventoryId + '/inventory_sources';
Rest.setUrl(this.url); Rest.setUrl(this.url);
return Rest.options() return Rest.options()
.success(this.success.bind(this)) .then(this.then.bind(this))
.error(this.error.bind(this)); .error(this.error.bind(this));
}, },
updateInventorySourcesGet: function(inventoryId) { updateInventorySourcesGet: function(inventoryId) {
this.url = GetBasePath('inventory') + inventoryId + '/update_inventory_sources'; this.url = GetBasePath('inventory') + inventoryId + '/update_inventory_sources';
Rest.setUrl(this.url); Rest.setUrl(this.url);
return Rest.get() return Rest.get()
.success(this.success.bind(this)) .then(this.then.bind(this))
.error(this.error.bind(this)); .error(this.error.bind(this));
}, },
getHost: function(inventoryId, hostId) { getHost: function(inventoryId, hostId) {
this.url = GetBasePath('inventory') + inventoryId + '/hosts?id=' + hostId; this.url = GetBasePath('inventory') + inventoryId + '/hosts?id=' + hostId;
Rest.setUrl(this.url); Rest.setUrl(this.url);
return Rest.get() return Rest.get()
.success(this.success.bind(this)) .then(this.then.bind(this))
.error(this.error.bind(this)); .error(this.error.bind(this));
} }
}; };

4
awx/ui/client/src/inventory-scripts/add/add.controller.js
View File

@@ -19,7 +19,7 @@ export default ['Rest', 'Wait',
function init() { function init() {
Rest.setUrl(url); Rest.setUrl(url);
Rest.options() Rest.options()
.success(function(data) { .then(({data}) => {
if (!data.actions.POST) { if (!data.actions.POST) {
$state.go("^"); $state.go("^");
Alert('Permission Error', 'You do not have permission to add an inventory script.', 'alert-info'); Alert('Permission Error', 'You do not have permission to add an inventory script.', 'alert-info');
@@ -43,7 +43,7 @@ export default ['Rest', 'Wait',
organization: $scope.organization, organization: $scope.organization,
script: $scope.script script: $scope.script
}) })
.success(function() { .then(() => {
$state.go('inventoryScripts', null, { reload: true }); $state.go('inventoryScripts', null, { reload: true });
Wait('stop'); Wait('stop');
}) })

2
awx/ui/client/src/inventory-scripts/edit/edit.controller.js
View File

@@ -59,7 +59,7 @@ export default ['Rest', 'Wait',
organization: $scope.organization, organization: $scope.organization,
script: $scope.script script: $scope.script
}) })
.success(function() { .then(() => {
$state.go('inventoryScripts', null, { reload: true }); $state.go('inventoryScripts', null, { reload: true });
Wait('stop'); Wait('stop');
}) })

2
awx/ui/client/src/inventory-scripts/list/list.controller.js
View File

@@ -50,7 +50,7 @@ export default ['$rootScope', '$scope', 'Wait', 'InventoryScriptsList',
var url = defaultUrl + id + '/'; var url = defaultUrl + id + '/';
Rest.setUrl(url); Rest.setUrl(url);
Rest.destroy() Rest.destroy()
.success(function() { .then(() => {
let reloadListStateParams = null; let reloadListStateParams = null;

6
awx/ui/client/src/job-results/job-results.route.js
View File

@@ -76,7 +76,7 @@ export default {
Rest.setUrl(jobData.related.job_events + Rest.setUrl(jobData.related.job_events +
"?event=playbook_on_stats"); "?event=playbook_on_stats");
Rest.get() Rest.get()
.success(function(data) { .then(({data}) => {
if(!data.results[0]){ if(!data.results[0]){
defer.resolve({val: { defer.resolve({val: {
ok: 0, ok: 0,
@@ -131,7 +131,7 @@ export default {
var getNext = function(data, arr, resolve) { var getNext = function(data, arr, resolve) {
Rest.setUrl(data.next); Rest.setUrl(data.next);
Rest.get() Rest.get()
.success(function (data) { .then(({data}) => {
if (data.next) { if (data.next) {
getNext(data, arr.concat(data.results), resolve); getNext(data, arr.concat(data.results), resolve);
} else { } else {
@@ -145,7 +145,7 @@ export default {
Rest.setUrl(GetBasePath('jobs') + $stateParams.id + '/labels/'); Rest.setUrl(GetBasePath('jobs') + $stateParams.id + '/labels/');
Rest.get() Rest.get()
.success(function(data) { .then(({data}) => {
if (data.next) { if (data.next) {
getNext(data, data.results, seeMoreResolve); getNext(data, data.results, seeMoreResolve);
} else { } else {

10
awx/ui/client/src/job-results/job-results.service.js
View File

@@ -73,7 +73,7 @@ function ($q, Prompt, $filter, Wait, Rest, $state, ProcessErrors, InitiatePlaybo
Rest.setUrl(url); Rest.setUrl(url);
Rest.get() Rest.get()
.success(function(data) { .then(({data}) => {
val.resolve({results: data.results, val.resolve({results: data.results,
next: data.next}); next: data.next});
}) })
@@ -101,7 +101,7 @@ function ($q, Prompt, $filter, Wait, Rest, $state, ProcessErrors, InitiatePlaybo
Wait('start'); Wait('start');
Rest.setUrl(job.url); Rest.setUrl(job.url);
Rest.destroy() Rest.destroy()
.success(function() { .then(() => {
Wait('stop'); Wait('stop');
$('#prompt-modal').modal('hide'); $('#prompt-modal').modal('hide');
$state.go('jobs'); $state.go('jobs');
@@ -123,7 +123,7 @@ function ($q, Prompt, $filter, Wait, Rest, $state, ProcessErrors, InitiatePlaybo
var doCancel = function() { var doCancel = function() {
Rest.setUrl(job.url + 'cancel'); Rest.setUrl(job.url + 'cancel');
Rest.post({}) Rest.post({})
.success(function() { .then(() => {
Wait('stop'); Wait('stop');
$('#prompt-modal').modal('hide'); $('#prompt-modal').modal('hide');
}) })
@@ -150,7 +150,7 @@ function ($q, Prompt, $filter, Wait, Rest, $state, ProcessErrors, InitiatePlaybo
Wait('start'); Wait('start');
Rest.setUrl(job.url + 'cancel'); Rest.setUrl(job.url + 'cancel');
Rest.get() Rest.get()
.success(function(data) { .then(({data}) => {
if (data.can_cancel === true) { if (data.can_cancel === true) {
doCancel(); doCancel();
} else { } else {
@@ -239,7 +239,7 @@ function ($q, Prompt, $filter, Wait, Rest, $state, ProcessErrors, InitiatePlaybo
url = url + id + '/job_events/?' + this.stringifyParams(params); url = url + id + '/job_events/?' + this.stringifyParams(params);
Rest.setUrl(url); Rest.setUrl(url);
return Rest.get() return Rest.get()
.success(function(data){ .then(({data}) => {
return data; return data;
}) })
.error(function(data, status) { .error(function(data, status) {

6
awx/ui/client/src/job-submission/job-submission-factories/adhoc-run.factory.js
View File

@@ -59,7 +59,7 @@
Wait('start'); Wait('start');
Rest.setUrl(GetBasePath('ad_hoc_commands') + new_job_id + '/'); Rest.setUrl(GetBasePath('ad_hoc_commands') + new_job_id + '/');
Rest.destroy() Rest.destroy()
.success(function() { .then(() => {
Wait('stop'); Wait('stop');
}) })
.error(function (data, status) { .error(function (data, status) {
@@ -86,7 +86,7 @@
// Re-launch the adhoc job // Re-launch the adhoc job
Rest.setUrl(url); Rest.setUrl(url);
Rest.post(postData) Rest.post(postData)
.success(function (data) { .then(({data}) => {
Wait('stop'); Wait('stop');
if($location.path().replace(/^\//, '').split('/')[0] !== 'jobs') { if($location.path().replace(/^\//, '').split('/')[0] !== 'jobs') {
$state.go('adHocJobStdout', {id: data.id}); $state.go('adHocJobStdout', {id: data.id});
@@ -133,7 +133,7 @@
url = GetBasePath('ad_hoc_commands') + id + '/relaunch/'; url = GetBasePath('ad_hoc_commands') + id + '/relaunch/';
Rest.setUrl(url); Rest.setUrl(url);
Rest.get() Rest.get()
.success(function (data) { .then(({data}) => {
new_job_id = data.id; new_job_id = data.id;
scope.passwords_needed_to_start = data.passwords_needed_to_start; scope.passwords_needed_to_start = data.passwords_needed_to_start;

2
awx/ui/client/src/job-submission/job-submission-factories/check-passwords.factory.js
View File

@@ -9,7 +9,7 @@ export default
if (!Empty(credential)) { if (!Empty(credential)) {
Rest.setUrl(GetBasePath('credentials')+credential); Rest.setUrl(GetBasePath('credentials')+credential);
Rest.get() Rest.get()
.success(function (data) { .then(({data}) => {
credentialTypesLookup() credentialTypesLookup()
.then(kinds => { .then(kinds => {
if(data.credential_type === kinds.Machine && data.inputs){ if(data.credential_type === kinds.Machine && data.inputs){

2
awx/ui/client/src/job-submission/job-submission-factories/getsurveyquestions.factory.js
View File

@@ -20,7 +20,7 @@ export default
Rest.setUrl(survey_url); Rest.setUrl(survey_url);
Rest.get() Rest.get()
.success(function (data) { .then(({data}) => {
if(!Empty(data)){ if(!Empty(data)){
scope.survey_name = data.name; scope.survey_name = data.name;
scope.survey_description = data.description; scope.survey_description = data.description;

2
awx/ui/client/src/job-submission/job-submission-factories/inventory-update.factory.js
View File

@@ -42,7 +42,7 @@ export default
Wait('start'); Wait('start');
Rest.setUrl(url); Rest.setUrl(url);
Rest.get() Rest.get()
.success(function (data) { .then(({data}) => {
if(params.updateAllSources) { if(params.updateAllSources) {
scope.$emit('StartTheUpdate', {}); scope.$emit('StartTheUpdate', {});
} }

4
awx/ui/client/src/job-submission/job-submission-factories/launchjob.factory.js
View File

@@ -139,7 +139,7 @@ export default
Rest.setUrl(url); Rest.setUrl(url);
Rest.post(job_launch_data) Rest.post(job_launch_data)
.success(function(data) { .then(({data}) => {
Wait('stop'); Wait('stop');
var job = data.job || data.system_job || data.project_update || data.inventory_update || data.ad_hoc_command; var job = data.job || data.system_job || data.project_update || data.inventory_update || data.ad_hoc_command;
if(base !== 'portal' && Empty(data.system_job) || (base === 'home')){ if(base !== 'portal' && Empty(data.system_job) || (base === 'home')){
@@ -200,7 +200,7 @@ export default
var getExtraVars = function() { var getExtraVars = function() {
Rest.setUrl(vars_url); Rest.setUrl(vars_url);
Rest.get() Rest.get()
.success(function (data) { .then(({data}) => {
if(!Empty(data.extra_vars)){ if(!Empty(data.extra_vars)){
data.extra_vars = ToJSON('yaml', data.extra_vars, false); data.extra_vars = ToJSON('yaml', data.extra_vars, false);
$.each(data.extra_vars, function(key,value){ $.each(data.extra_vars, function(key,value){

2
awx/ui/client/src/job-submission/job-submission-factories/project-update.factory.js
View File

@@ -43,7 +43,7 @@ export default
Wait('start'); Wait('start');
Rest.setUrl(url); Rest.setUrl(url);
Rest.get() Rest.get()
.success(function (data) { .then(({data}) => {
project = data; project = data;
if (project.can_update) { if (project.can_update) {
if (project.passwords_needed_to_updated) { if (project.passwords_needed_to_updated) {

2
awx/ui/client/src/job-submission/job-submission.controller.js
View File

@@ -152,7 +152,7 @@ export default
Wait('start'); Wait('start');
Rest.setUrl(launch_url); Rest.setUrl(launch_url);
Rest.get() Rest.get()
.success(function (data) { .then(({data}) => {
// Put all the data that we get back about the launch onto scope // Put all the data that we get back about the launch onto scope
angular.extend($scope, data); angular.extend($scope, data);

6
awx/ui/client/src/jobs/factories/delete-job.factory.js
View File

@@ -42,7 +42,7 @@
Rest.setUrl(url); Rest.setUrl(url);
if (action_label === 'cancel') { if (action_label === 'cancel') {
Rest.post() Rest.post()
.success(function () { .then(() => {
$('#prompt-modal').modal('hide'); $('#prompt-modal').modal('hide');
if (callback) { if (callback) {
scope.$emit(callback, action_label); scope.$emit(callback, action_label);
@@ -64,7 +64,7 @@
}); });
} else { } else {
Rest.destroy() Rest.destroy()
.success(function () { .then(() => {
$('#prompt-modal').modal('hide'); $('#prompt-modal').modal('hide');
if (callback) { if (callback) {
scope.$emit(callback, action_label); scope.$emit(callback, action_label);
@@ -119,7 +119,7 @@
if (action_label === 'cancel') { if (action_label === 'cancel') {
Rest.setUrl(url); Rest.setUrl(url);
Rest.get() Rest.get()
.success(function(data) { .then(({data}) => {
if (data.can_cancel) { if (data.can_cancel) {
scope.$emit('CancelJob'); scope.$emit('CancelJob');
} }

2
awx/ui/client/src/jobs/factories/relaunch-inventory.factory.js
View File

@@ -7,7 +7,7 @@ export default
Wait('start'); Wait('start');
Rest.setUrl(url); Rest.setUrl(url);
Rest.get() Rest.get()
.success(function (data) { .then(({data}) => {
InventoryUpdate({ InventoryUpdate({
scope: scope, scope: scope,
url: data.related.update url: data.related.update

2
awx/ui/client/src/license/license.controller.js
View File

@@ -86,7 +86,7 @@ export default
$scope.submit = function(){ $scope.submit = function(){
Wait('start'); Wait('start');
CheckLicense.post($scope.newLicense.file, $scope.newLicense.eula) CheckLicense.post($scope.newLicense.file, $scope.newLicense.eula)
.success(function(){ .then(() => {
reset(); reset();
ConfigService.delete(); ConfigService.delete();
ConfigService.getConfig().then(function(config){ ConfigService.getConfig().then(function(config){

2
awx/ui/client/src/login/loginModal/loginModal.controller.js
View File

@@ -139,7 +139,7 @@ export default ['$log', '$cookies', '$compile', '$rootScope',
scope.removeAuthorizationGetUser = scope.$on('AuthorizationGetUser', function() { scope.removeAuthorizationGetUser = scope.$on('AuthorizationGetUser', function() {
// Get all the profile/access info regarding the logged in user // Get all the profile/access info regarding the logged in user
Authorization.getUser() Authorization.getUser()
.success(function (data) { .then(({data}) => {
Authorization.setUserInfo(data); Authorization.setUserInfo(data);
Timer.init().then(function(timer){ Timer.init().then(function(timer){
$rootScope.sessionTimer = timer; $rootScope.sessionTimer = timer;

6
awx/ui/client/src/management-jobs/card/card.controller.js
View File

@@ -20,7 +20,7 @@ export default
var getManagementJobs = function(){ var getManagementJobs = function(){
Rest.setUrl(defaultUrl); Rest.setUrl(defaultUrl);
Rest.get() Rest.get()
.success(function(data){ .then(({data}) => {
$scope.mgmtCards = data.results; $scope.mgmtCards = data.results;
Wait('stop'); Wait('stop');
}) })
@@ -128,7 +128,7 @@ export default
Rest.setUrl(defaultUrl); Rest.setUrl(defaultUrl);
Rest.post(data) Rest.post(data)
.success(function(data) { .then(({data}) => {
Wait('stop'); Wait('stop');
$("#prompt-for-days-facts").dialog("close"); $("#prompt-for-days-facts").dialog("close");
$("#configure-dialog").dialog('close'); $("#configure-dialog").dialog('close');
@@ -218,7 +218,7 @@ export default
Rest.setUrl(defaultUrl); Rest.setUrl(defaultUrl);
Rest.post(data) Rest.post(data)
.success(function(data) { .then(({data}) => {
Wait('stop'); Wait('stop');
$("#prompt-for-days").dialog("close"); $("#prompt-for-days").dialog("close");
// $("#configure-dialog").dialog('close'); // $("#configure-dialog").dialog('close');

6
awx/ui/client/src/notifications/add/add.controller.js
View File

@@ -24,7 +24,7 @@ export default ['Rest', 'Wait', 'NotificationsFormObject',
function init() { function init() {
Rest.setUrl(GetBasePath('projects')); Rest.setUrl(GetBasePath('projects'));
Rest.options() Rest.options()
.success(function(data) { .then(({data}) => {
if (!data.actions.POST) { if (!data.actions.POST) {
$state.go("^"); $state.go("^");
Alert('Permission Error', 'You do not have permission to add a notification template.', 'alert-info'); Alert('Permission Error', 'You do not have permission to add a notification template.', 'alert-info');
@@ -48,7 +48,7 @@ export default ['Rest', 'Wait', 'NotificationsFormObject',
Rest.setUrl(url); Rest.setUrl(url);
Rest.get() Rest.get()
.success(function(data) { .then(({data}) => {
$scope.organization_name = data.name; $scope.organization_name = data.name;
}) })
.error(function(data, status) { .error(function(data, status) {
@@ -213,7 +213,7 @@ export default ['Rest', 'Wait', 'NotificationsFormObject',
Wait('start'); Wait('start');
Rest.setUrl(url); Rest.setUrl(url);
Rest.post(params) Rest.post(params)
.success(function() { .then(() => {
$state.go('notifications', {}, { reload: true }); $state.go('notifications', {}, { reload: true });
Wait('stop'); Wait('stop');
}) })

4
awx/ui/client/src/notifications/edit/edit.controller.js
View File

@@ -59,7 +59,7 @@ export default ['Rest', 'Wait',
Wait('start'); Wait('start');
Rest.setUrl(url + id + '/'); Rest.setUrl(url + id + '/');
Rest.get() Rest.get()
.success(function(data) { .then(({data}) => {
var fld; var fld;
for (fld in form.fields) { for (fld in form.fields) {
if (data[fld]) { if (data[fld]) {
@@ -280,7 +280,7 @@ export default ['Rest', 'Wait',
Wait('start'); Wait('start');
Rest.setUrl(url + id + '/'); Rest.setUrl(url + id + '/');
Rest.put(params) Rest.put(params)
.success(function() { .then(() => {
$state.go('notifications', {}, { reload: true }); $state.go('notifications', {}, { reload: true });
Wait('stop'); Wait('stop');
}) })

2
awx/ui/client/src/notifications/notification-templates-list/list.controller.js
View File

@@ -164,7 +164,7 @@
var url = defaultUrl + id + '/'; var url = defaultUrl + id + '/';
Rest.setUrl(url); Rest.setUrl(url);
Rest.destroy() Rest.destroy()
.success(function() { .then(() => {
let reloadListStateParams = null; let reloadListStateParams = null;

2
awx/ui/client/src/notifications/shared/notification-list-init.factory.js
View File

@@ -26,7 +26,7 @@ export default ['Wait', 'GetBasePath', 'ProcessErrors', 'Rest', 'GetChoices',
Rest.setUrl($rootScope.current_user.related.admin_of_organizations); Rest.setUrl($rootScope.current_user.related.admin_of_organizations);
Rest.get() Rest.get()
.success(function(data) { .then(({data}) => {
scope.current_user_admin_orgs = data.results.map(i => i.name); scope.current_user_admin_orgs = data.results.map(i => i.name);
}); });

2
awx/ui/client/src/notifications/shared/toggle-notification.factory.js
View File

@@ -39,7 +39,7 @@ export default ['Wait', 'ProcessErrors', 'Rest',
Wait('start'); Wait('start');
Rest.setUrl(url); Rest.setUrl(url);
Rest.post(params) Rest.post(params)
.success( function(data) { .then(({data}) => {
if (callback) { if (callback) {
scope.$emit(callback, data.id); scope.$emit(callback, data.id);
notifier[column] = !notifier[column]; notifier[column] = !notifier[column];

2
awx/ui/client/src/organizations/add/organizations-add.controller.js
View File

@@ -12,7 +12,7 @@ export default ['$scope', '$rootScope', '$location', '$stateParams',
Rest.setUrl(GetBasePath('organizations')); Rest.setUrl(GetBasePath('organizations'));
Rest.options() Rest.options()
.success(function(data) { .then(({data}) => {
if (!data.actions.POST) { if (!data.actions.POST) {
$state.go("^"); $state.go("^");
Alert('Permission Error', 'You do not have permission to add an organization.', 'alert-info'); Alert('Permission Error', 'You do not have permission to add an organization.', 'alert-info');

4
awx/ui/client/src/organizations/edit/organizations-edit.controller.js
View File

@@ -36,7 +36,7 @@ export default ['$scope', '$location', '$stateParams',
Wait('start'); Wait('start');
Rest.setUrl(defaultUrl + id + '/'); Rest.setUrl(defaultUrl + id + '/');
Rest.get() Rest.get()
.success(function(data) { .then(({data}) => {
let fld; let fld;
$scope.organization_name = data.name; $scope.organization_name = data.name;
@@ -124,7 +124,7 @@ export default ['$scope', '$location', '$stateParams',
var url = defaultUrl + $stateParams.organization_id + '/' + set + '/'; var url = defaultUrl + $stateParams.organization_id + '/' + set + '/';
Rest.setUrl(url); Rest.setUrl(url);
Rest.post({ id: itm_id, disassociate: 1 }) Rest.post({ id: itm_id, disassociate: 1 })
.success(function() { .then(() => {
$('#prompt-modal').modal('hide'); $('#prompt-modal').modal('hide');
}) })
.error(function(data, status) { .error(function(data, status) {

4
awx/ui/client/src/organizations/linkout/controllers/organizations-admins.controller.js
View File

@@ -24,7 +24,7 @@ export default ['$stateParams', '$scope', 'Rest', '$state',
Rest.setUrl(orgBase + $stateParams.organization_id); Rest.setUrl(orgBase + $stateParams.organization_id);
Rest.get() Rest.get()
.success(function(data) { .then(({data}) => {
$scope.organization_name = data.name; $scope.organization_name = data.name;
$scope.name = data.name; $scope.name = data.name;
$scope.org_id = data.id; $scope.org_id = data.id;
@@ -51,7 +51,7 @@ export default ['$stateParams', '$scope', 'Rest', '$state',
Rest.post({ Rest.post({
id: id, id: id,
disassociate: true disassociate: true
}).success(function() { }).then(() => {
$state.go('.', null, { reload: true }); $state.go('.', null, { reload: true });
}) })
.error(function(data, status) { .error(function(data, status) {

6
awx/ui/client/src/organizations/linkout/controllers/organizations-inventories.controller.js
View File

@@ -28,7 +28,7 @@ export default ['$scope', '$rootScope', '$location',
$rootScope.flashMessage = null; $rootScope.flashMessage = null;
Rest.setUrl(orgBase + $stateParams.organization_id); Rest.setUrl(orgBase + $stateParams.organization_id);
Rest.get() Rest.get()
.success(function(data) { .then(({data}) => {
$scope.organization_name = data.name; $scope.organization_name = data.name;
$scope.name = data.name; $scope.name = data.name;
@@ -194,7 +194,7 @@ export default ['$scope', '$rootScope', '$location',
Wait('start'); Wait('start');
Rest.setUrl(inventory.related.inventory_sources + '?or__source=ec2&or__source=rax&order_by=-last_job_run&page_size=5'); Rest.setUrl(inventory.related.inventory_sources + '?or__source=ec2&or__source=rax&order_by=-last_job_run&page_size=5');
Rest.get() Rest.get()
.success(function(data) { .then(({data}) => {
$scope.$emit('GroupSummaryReady', event, inventory, data); $scope.$emit('GroupSummaryReady', event, inventory, data);
}) })
.error(function(data, status) { .error(function(data, status) {
@@ -218,7 +218,7 @@ export default ['$scope', '$rootScope', '$location',
url += "&order_by=-finished&page_size=5"; url += "&order_by=-finished&page_size=5";
Rest.setUrl(url); Rest.setUrl(url);
Rest.get() Rest.get()
.success(function(data) { .then(({data}) => {
$scope.$emit('HostSummaryReady', event, data); $scope.$emit('HostSummaryReady', event, data);
}) })
.error(function(data, status) { .error(function(data, status) {

2
awx/ui/client/src/organizations/linkout/controllers/organizations-job-templates.controller.js
View File

@@ -34,7 +34,7 @@ export default ['$scope', '$rootScope',
$scope[list.name] = $scope[`${list.iterator}_dataset`].results; $scope[list.name] = $scope[`${list.iterator}_dataset`].results;
Rest.setUrl(orgBase + $stateParams.organization_id); Rest.setUrl(orgBase + $stateParams.organization_id);
Rest.get() Rest.get()
.success(function(data) { .then(({data}) => {
$scope.organization_name = data.name; $scope.organization_name = data.name;
$scope.name = data.name; $scope.name = data.name;
$scope.org_id = data.id; $scope.org_id = data.id;

12
awx/ui/client/src/organizations/linkout/controllers/organizations-projects.controller.js
View File

@@ -99,7 +99,7 @@ export default ['$scope', '$rootScope', '$log', '$stateParams', 'Rest', 'Alert',
// Go out and get the organization // Go out and get the organization
Rest.setUrl(orgBase + $stateParams.organization_id); Rest.setUrl(orgBase + $stateParams.organization_id);
Rest.get() Rest.get()
.success(function(data) { .then(({data}) => {
$scope.organization_name = data.name; $scope.organization_name = data.name;
$scope.name = data.name; $scope.name = data.name;
$scope.org_id = data.id; $scope.org_id = data.id;
@@ -205,7 +205,7 @@ export default ['$scope', '$rootScope', '$log', '$stateParams', 'Rest', 'Alert',
// Refresh what we have in memory to insure we're accessing the most recent status record // Refresh what we have in memory to insure we're accessing the most recent status record
Rest.setUrl(project.url); Rest.setUrl(project.url);
Rest.get() Rest.get()
.success(function(data) { .then(({data}) => {
$scope.$emit('GoTojobResults', data); $scope.$emit('GoTojobResults', data);
}) })
.error(function(data, status) { .error(function(data, status) {
@@ -224,7 +224,7 @@ export default ['$scope', '$rootScope', '$log', '$stateParams', 'Rest', 'Alert',
// Cancel the project update process // Cancel the project update process
Rest.setUrl(url); Rest.setUrl(url);
Rest.post() Rest.post()
.success(function() { .then(() => {
Alert('SCM Update Cancel', 'Your request to cancel the update was submitted to the task manager.', 'alert-info'); Alert('SCM Update Cancel', 'Your request to cancel the update was submitted to the task manager.', 'alert-info');
$scope.refresh(); $scope.refresh();
}) })
@@ -241,7 +241,7 @@ export default ['$scope', '$rootScope', '$log', '$stateParams', 'Rest', 'Alert',
var url = data.related.cancel; var url = data.related.cancel;
Rest.setUrl(url); Rest.setUrl(url);
Rest.get() Rest.get()
.success(function(data) { .then(({data}) => {
if (data.can_cancel) { if (data.can_cancel) {
$scope.$emit('Cancel_Update', url); $scope.$emit('Cancel_Update', url);
} else { } else {
@@ -257,11 +257,11 @@ export default ['$scope', '$rootScope', '$log', '$stateParams', 'Rest', 'Alert',
$scope.cancelUpdate = function(id, name) { $scope.cancelUpdate = function(id, name) {
Rest.setUrl(GetBasePath("projects") + id); Rest.setUrl(GetBasePath("projects") + id);
Rest.get() Rest.get()
.success(function(data) { .then(({data}) => {
if (data.related.current_update) { if (data.related.current_update) {
Rest.setUrl(data.related.current_update); Rest.setUrl(data.related.current_update);
Rest.get() Rest.get()
.success(function(data) { .then(({data}) => {
$scope.$emit('Check_Cancel', data); $scope.$emit('Check_Cancel', data);
}) })
.error(function(data, status) { .error(function(data, status) {

2
awx/ui/client/src/organizations/linkout/controllers/organizations-teams.controller.js
View File

@@ -30,7 +30,7 @@ export default ['$scope', '$stateParams', 'OrgTeamList', 'Rest', 'OrgTeamsDatase
Rest.setUrl(orgBase + $stateParams.organization_id); Rest.setUrl(orgBase + $stateParams.organization_id);
Rest.get() Rest.get()
.success(function(data) { .then(({data}) => {
$scope.organization_name = data.name; $scope.organization_name = data.name;
$scope.name = data.name; $scope.name = data.name;

4
awx/ui/client/src/organizations/linkout/controllers/organizations-users.controller.js
View File

@@ -23,7 +23,7 @@ export default ['$stateParams', '$scope', 'OrgUserList','Rest', '$state',
Rest.setUrl(orgBase + $stateParams.organization_id); Rest.setUrl(orgBase + $stateParams.organization_id);
Rest.get() Rest.get()
.success(function(data) { .then(({data}) => {
$scope.organization_name = data.name; $scope.organization_name = data.name;
$scope.name = data.name; $scope.name = data.name;
$scope.org_id = data.id; $scope.org_id = data.id;
@@ -50,7 +50,7 @@ export default ['$stateParams', '$scope', 'OrgUserList','Rest', '$state',
Rest.post({ Rest.post({
id: id, id: id,
disassociate: true disassociate: true
}).success(function() { }).then(() => {
$state.go('.', null, { reload: true }); $state.go('.', null, { reload: true });
}) })
.error(function(data, status) { .error(function(data, status) {

2
awx/ui/client/src/organizations/list/organizations-list.controller.js
View File

@@ -143,7 +143,7 @@ export default ['$stateParams', '$scope', '$rootScope',
var url = defaultUrl + id + '/'; var url = defaultUrl + id + '/';
Rest.setUrl(url); Rest.setUrl(url);
Rest.destroy() Rest.destroy()
.success(function() { .then(() => {
Wait('stop'); Wait('stop');
let reloadListStateParams = null; let reloadListStateParams = null;

4
awx/ui/client/src/projects/add/projects-add.controller.js
View File

@@ -23,7 +23,7 @@ export default ['$scope', '$location', '$stateParams', 'GenerateForm',
$scope.canEditOrg = true; $scope.canEditOrg = true;
Rest.setUrl(GetBasePath('projects')); Rest.setUrl(GetBasePath('projects'));
Rest.options() Rest.options()
.success(function(data) { .then(({data}) => {
if (!data.actions.POST) { if (!data.actions.POST) {
$state.go("^"); $state.go("^");
Alert(i18n._('Permission Error'), i18n._('You do not have permission to add a project.'), 'alert-info'); Alert(i18n._('Permission Error'), i18n._('You do not have permission to add a project.'), 'alert-info');
@@ -99,7 +99,7 @@ export default ['$scope', '$location', '$stateParams', 'GenerateForm',
Wait('start'); Wait('start');
Rest.setUrl(url); Rest.setUrl(url);
Rest.post(data) Rest.post(data)
.success(function(data) { .then(({data}) => {
$scope.addedItem = data.id; $scope.addedItem = data.id;
$state.go('projects.edit', { project_id: data.id }, { reload: true }); $state.go('projects.edit', { project_id: data.id }, { reload: true });
}) })

6
awx/ui/client/src/projects/edit/projects-edit.controller.js
View File

@@ -85,7 +85,7 @@ export default ['$scope', '$rootScope', '$stateParams', 'ProjectsForm', 'Rest',
// Retrieve detail record and prepopulate the form // Retrieve detail record and prepopulate the form
Rest.setUrl(defaultUrl); Rest.setUrl(defaultUrl);
Rest.get({ params: { id: id } }) Rest.get({ params: { id: id } })
.success(function(data) { .then(({data}) => {
var fld, i; var fld, i;
for (fld in form.fields) { for (fld in form.fields) {
if (form.fields[fld].type === 'checkbox_group') { if (form.fields[fld].type === 'checkbox_group') {
@@ -214,7 +214,7 @@ export default ['$scope', '$rootScope', '$stateParams', 'ProjectsForm', 'Rest',
Rest.setUrl(defaultUrl); Rest.setUrl(defaultUrl);
Rest.put(params) Rest.put(params)
.success(function() { .then(() => {
Wait('stop'); Wait('stop');
$state.go($state.current, {}, { reload: true }); $state.go($state.current, {}, { reload: true });
}) })
@@ -230,7 +230,7 @@ export default ['$scope', '$rootScope', '$stateParams', 'ProjectsForm', 'Rest',
$rootScope.flashMessage = null; $rootScope.flashMessage = null;
Rest.setUrl(url); Rest.setUrl(url);
Rest.post({ id: itm_id, disassociate: 1 }) Rest.post({ id: itm_id, disassociate: 1 })
.success(function() { .then(() => {
$('#prompt-modal').modal('hide'); $('#prompt-modal').modal('hide');
}) })
.error(function(data, status) { .error(function(data, status) {

2
awx/ui/client/src/projects/factories/get-project-path.factory.js
View File

@@ -26,7 +26,7 @@ export default
Rest.setUrl(GetBasePath('config')); Rest.setUrl(GetBasePath('config'));
Rest.get() Rest.get()
.success(function (data) { .then(({data}) => {
var opts = [], i; var opts = [], i;
if (data.project_local_paths) { if (data.project_local_paths) {
for (i = 0; i < data.project_local_paths.length; i++) { for (i = 0; i < data.project_local_paths.length; i++) {

12
awx/ui/client/src/projects/list/projects-list.controller.js
View File

@@ -162,7 +162,7 @@ export default ['$scope', '$rootScope', '$log', 'Rest', 'Alert',
// Refresh what we have in memory to insure we're accessing the most recent status record // Refresh what we have in memory to insure we're accessing the most recent status record
Rest.setUrl(project.url); Rest.setUrl(project.url);
Rest.get() Rest.get()
.success(function(data) { .then(({data}) => {
$scope.$emit('GoTojobResults', data); $scope.$emit('GoTojobResults', data);
}) })
.error(function(data, status) { .error(function(data, status) {
@@ -179,7 +179,7 @@ export default ['$scope', '$rootScope', '$log', 'Rest', 'Alert',
var url = defaultUrl + id + '/'; var url = defaultUrl + id + '/';
Rest.setUrl(url); Rest.setUrl(url);
Rest.destroy() Rest.destroy()
.success(function() { .then(() => {
let reloadListStateParams = null; let reloadListStateParams = null;
@@ -218,7 +218,7 @@ export default ['$scope', '$rootScope', '$log', 'Rest', 'Alert',
// Cancel the project update process // Cancel the project update process
Rest.setUrl(url); Rest.setUrl(url);
Rest.post() Rest.post()
.success(function () { .then(() => {
Alert(i18n._('SCM Update Cancel'), i18n._('Your request to cancel the update was submitted to the task manager.'), 'alert-info'); Alert(i18n._('SCM Update Cancel'), i18n._('Your request to cancel the update was submitted to the task manager.'), 'alert-info');
}) })
.error(function (data, status) { .error(function (data, status) {
@@ -234,7 +234,7 @@ export default ['$scope', '$rootScope', '$log', 'Rest', 'Alert',
var url = data.related.cancel; var url = data.related.cancel;
Rest.setUrl(url); Rest.setUrl(url);
Rest.get() Rest.get()
.success(function(data) { .then(({data}) => {
if (data.can_cancel) { if (data.can_cancel) {
$scope.$emit('Cancel_Update', url); $scope.$emit('Cancel_Update', url);
} else { } else {
@@ -251,11 +251,11 @@ export default ['$scope', '$rootScope', '$log', 'Rest', 'Alert',
project.pending_cancellation = true; project.pending_cancellation = true;
Rest.setUrl(GetBasePath("projects") + project.id); Rest.setUrl(GetBasePath("projects") + project.id);
Rest.get() Rest.get()
.success(function(data) { .then(({data}) => {
if (data.related.current_update) { if (data.related.current_update) {
Rest.setUrl(data.related.current_update); Rest.setUrl(data.related.current_update);
Rest.get() Rest.get()
.success(function(data) { .then(({data}) => {
$scope.$emit('Check_Cancel', data); $scope.$emit('Check_Cancel', data);
}) })
.error(function (data, status) { .error(function (data, status) {

2
awx/ui/client/src/rest/restServices.factory.js
View File

@@ -38,7 +38,7 @@
* var url = GetBasePath('inventories') + $stateParams.id + '/'; * var url = GetBasePath('inventories') + $stateParams.id + '/';
* Rest.setUrl(url); * Rest.setUrl(url);
* Rest.get() * Rest.get()
* .success(function(data) { * .then(({data}) => {
* // review the data object and take action * // review the data object and take action
* }) * })
* .error(function(status, data) { * .error(function(status, data) {

2
awx/ui/client/src/scheduler/factories/delete-schedule.factory.js
View File

@@ -22,7 +22,7 @@ export default
Wait('start'); Wait('start');
Rest.setUrl(url); Rest.setUrl(url);
Rest.destroy() Rest.destroy()
.success(function () { .then(() => {
$('#prompt-modal').modal('hide'); $('#prompt-modal').modal('hide');
scope.$emit(callback, id); scope.$emit(callback, id);

2
awx/ui/client/src/scheduler/factories/edit-schedule.factory.js
View File

@@ -121,7 +121,7 @@ export default
// Get the existing record // Get the existing record
Rest.setUrl(url); Rest.setUrl(url);
Rest.get() Rest.get()
.success(function(data) { .then(({data}) => {
schedule = data; schedule = data;
try { try {
schedule.extra_data = JSON.parse(schedule.extra_data); schedule.extra_data = JSON.parse(schedule.extra_data);

4
awx/ui/client/src/scheduler/factories/schedule-post.factory.js
View File

@@ -35,7 +35,7 @@ export default
Rest.setUrl(url); Rest.setUrl(url);
if (mode === 'add') { if (mode === 'add') {
Rest.post(schedule) Rest.post(schedule)
.success(function(){ .then(() => {
if (callback) { if (callback) {
scope.$emit(callback); scope.$emit(callback);
} }
@@ -50,7 +50,7 @@ export default
} }
else { else {
Rest.put(schedule) Rest.put(schedule)
.success(function(){ .then(() => {
if (callback) { if (callback) {
scope.$emit(callback, schedule); scope.$emit(callback, schedule);
} }

4
awx/ui/client/src/scheduler/factories/toggle-schedule.factory.js
View File

@@ -12,7 +12,7 @@ export default
scope.removeScheduleFound = scope.$on('ScheduleFound', function(e, data) { scope.removeScheduleFound = scope.$on('ScheduleFound', function(e, data) {
data.enabled = (data.enabled) ? false : true; data.enabled = (data.enabled) ? false : true;
Rest.put(data) Rest.put(data)
.success( function() { .then(() => {
Wait('stop'); Wait('stop');
$state.go('.', null, {reload: true}); $state.go('.', null, {reload: true});
}) })
@@ -27,7 +27,7 @@ export default
// Get the schedule // Get the schedule
Rest.setUrl(url); Rest.setUrl(url);
Rest.get() Rest.get()
.success(function(data) { .then(({data}) => {
scope.$emit('ScheduleFound', data); scope.$emit('ScheduleFound', data);
}) })
.error(function(data,status){ .error(function(data,status){

2
awx/ui/client/src/shared/Utilities.js
View File

@@ -750,7 +750,7 @@ angular.module('Utilities', ['RestServices', 'Utilities'])
if (!options) { if (!options) {
Rest.setUrl(url); Rest.setUrl(url);
Rest.options() Rest.options()
.success(function(data) { .then(({data}) => {
withOptions(data); withOptions(data);
}) })
.error(function(data, status) { .error(function(data, status) {

4
awx/ui/client/src/shared/api-loader.js
View File

@@ -29,10 +29,10 @@ angular.module('ApiLoader', ['Utilities'])
return function () { return function () {
$http({ method: 'GET', url:'/api/', headers: { 'Authorization': "" } }) $http({ method: 'GET', url:'/api/', headers: { 'Authorization': "" } })
.success(function (data) { .then(({data}) => {
var base = data.current_version; var base = data.current_version;
$http({ method: 'GET', url:base, headers: { 'Authorization': "" } }) $http({ method: 'GET', url:base, headers: { 'Authorization': "" } })
.success(function (data) { .then(({data}) => {
data.base = base; data.base = base;
$rootScope.defaultUrls = data; $rootScope.defaultUrls = data;
Store('api', data); Store('api', data);

2
awx/ui/client/src/shared/directives.js
View File

@@ -556,7 +556,7 @@ function(ConfigurationUtils, i18n, $rootScope) {
Rest.setUrl(`${basePath}` + query); Rest.setUrl(`${basePath}` + query);
Rest.get() Rest.get()
.success(function (data) { .then(({data}) => {
if (data.count === 1) { if (data.count === 1) {
scope[modelKey] = data.results[0].name; scope[modelKey] = data.results[0].name;
scope[modelName] = data.results[0].id; scope[modelName] = data.results[0].id;

2
awx/ui/client/src/shared/org-admin-lookup/org-admin-lookup.factory.js
View File

@@ -14,7 +14,7 @@ export default
if(Authorization.getUserInfo('is_superuser') !== true) { if(Authorization.getUserInfo('is_superuser') !== true) {
Rest.setUrl(GetBasePath('users') + $rootScope.current_user.id + '/admin_of_organizations'); Rest.setUrl(GetBasePath('users') + $rootScope.current_user.id + '/admin_of_organizations');
Rest.get({ params: { id: params.organization } }) Rest.get({ params: { id: params.organization } })
.success(function(data) { .then(({data}) => {
if(data.count && data.count > 0) { if(data.count && data.count > 0) {
deferred.resolve(true); deferred.resolve(true);
} }

2
awx/ui/client/src/shared/rbacUiControl.js
View File

@@ -18,7 +18,7 @@ export default
Wait("start"); Wait("start");
Rest.options() Rest.options()
.success(function(data) { .then(({data}) => {
if (data.actions.POST) { if (data.actions.POST) {
canAddVal.resolve({canAdd: true, options: data}); canAddVal.resolve({canAdd: true, options: data});
} else { } else {

6
awx/ui/client/src/standard-out/log/standard-out-log.controller.js
View File

@@ -98,7 +98,7 @@ export default ['$log', '$rootScope', '$scope', '$state', '$stateParams', 'Proce
Rest.setUrl($scope.stdoutEndpoint + '?format=json&start_line=0&end_line=' + page_size); Rest.setUrl($scope.stdoutEndpoint + '?format=json&start_line=0&end_line=' + page_size);
Rest.get() Rest.get()
.success(function(data) { .then(({data}) => {
Wait('stop'); Wait('stop');
if (data.content) { if (data.content) {
api_complete = true; api_complete = true;
@@ -134,7 +134,7 @@ export default ['$log', '$rootScope', '$scope', '$state', '$stateParams', 'Proce
$('#stdoutMoreRowsBottom').fadeIn(); $('#stdoutMoreRowsBottom').fadeIn();
Rest.setUrl(url); Rest.setUrl(url);
Rest.get() Rest.get()
.success( function(data) { .then(({data}) => {
if ($('#pre-container-content').html() === "Waiting for results...") { if ($('#pre-container-content').html() === "Waiting for results...") {
$('#pre-container-content').html(data.content); $('#pre-container-content').html(data.content);
} else { } else {
@@ -166,7 +166,7 @@ export default ['$log', '$rootScope', '$scope', '$state', '$stateParams', 'Proce
'&end_line=' + (current_range.end + page_size); '&end_line=' + (current_range.end + page_size);
Rest.setUrl(url); Rest.setUrl(url);
Rest.get() Rest.get()
.success(function(data){ .then(({data}) => {
$('#pre-container-content').append(data.content); $('#pre-container-content').append(data.content);
current_range = data.range; current_range = data.range;
}) })

2
awx/ui/client/src/standard-out/standard-out-factories/lookup-name.factory.js
View File

@@ -13,7 +13,7 @@
callback = params.callback; callback = params.callback;
Rest.setUrl(url); Rest.setUrl(url);
Rest.get() Rest.get()
.success(function(data) { .then(({data}) => {
if (scope_var === 'inventory_source') { if (scope_var === 'inventory_source') {
scope.inventory = data.inventory; scope.inventory = data.inventory;
} }

2
awx/ui/client/src/standard-out/standard-out.controller.js
View File

@@ -79,7 +79,7 @@ export function JobStdoutController ($rootScope, $scope, $state, $stateParams,
// of stdout jobs. // of stdout jobs.
Rest.setUrl(GetBasePath('base') + jobType + '/' + job_id + '/'); Rest.setUrl(GetBasePath('base') + jobType + '/' + job_id + '/');
Rest.get() Rest.get()
.success(function(data) { .then(({data}) => {
$scope.job = data; $scope.job = data;
$scope.job_template_name = data.name; $scope.job_template_name = data.name;
$scope.created_by = data.summary_fields.created_by; $scope.created_by = data.summary_fields.created_by;

4
awx/ui/client/src/teams/add/teams-add.controller.js
View File

@@ -11,7 +11,7 @@ export default ['$scope', '$rootScope', 'TeamForm', 'GenerateForm', 'Rest',
Rest.setUrl(GetBasePath('teams')); Rest.setUrl(GetBasePath('teams'));
Rest.options() Rest.options()
.success(function(data) { .then(({data}) => {
if (!data.actions.POST) { if (!data.actions.POST) {
$state.go("^"); $state.go("^");
Alert('Permission Error', 'You do not have permission to add a team.', 'alert-info'); Alert('Permission Error', 'You do not have permission to add a team.', 'alert-info');
@@ -43,7 +43,7 @@ export default ['$scope', '$rootScope', 'TeamForm', 'GenerateForm', 'Rest',
data[fld] = $scope[fld]; data[fld] = $scope[fld];
} }
Rest.post(data) Rest.post(data)
.success(function(data) { .then(({data}) => {
Wait('stop'); Wait('stop');
$rootScope.flashMessage = "New team successfully created!"; $rootScope.flashMessage = "New team successfully created!";
$rootScope.$broadcast("EditIndicatorChange", "users", data.id); $rootScope.$broadcast("EditIndicatorChange", "users", data.id);

4
awx/ui/client/src/teams/edit/teams-edit.controller.js
View File

@@ -19,7 +19,7 @@ export default ['$scope', '$rootScope', '$stateParams', 'TeamForm', 'Rest',
$scope.team_id = id; $scope.team_id = id;
Rest.setUrl(defaultUrl); Rest.setUrl(defaultUrl);
Wait('start'); Wait('start');
Rest.get(defaultUrl).success(function(data) { Rest.get(defaultUrl).then(({data}) => {
setScopeFields(data); setScopeFields(data);
$scope.organization_name = data.summary_fields.organization.name; $scope.organization_name = data.summary_fields.organization.name;
@@ -74,7 +74,7 @@ export default ['$scope', '$rootScope', '$stateParams', 'TeamForm', 'Rest',
if ($scope[form.name + '_form'].$valid) { if ($scope[form.name + '_form'].$valid) {
var data = processNewData(form.fields); var data = processNewData(form.fields);
Rest.setUrl(defaultUrl); Rest.setUrl(defaultUrl);
Rest.put(data).success(function() { Rest.put(data).then(() => {
$state.go($state.current, null, { reload: true }); $state.go($state.current, null, { reload: true });
}) })
.error(function(data, status) { .error(function(data, status) {

2
awx/ui/client/src/teams/list/teams-list.controller.js
View File

@@ -48,7 +48,7 @@ export default ['$scope', 'Rest', 'TeamList', 'Prompt',
var url = defaultUrl + id + '/'; var url = defaultUrl + id + '/';
Rest.setUrl(url); Rest.setUrl(url);
Rest.destroy() Rest.destroy()
.success(function() { .then(() => {
Wait('stop'); Wait('stop');
$('#prompt-modal').modal('hide'); $('#prompt-modal').modal('hide');

8
awx/ui/client/src/templates/job_templates/add-job-template/job-template-add.controller.js
View File

@@ -146,7 +146,7 @@
url = GetBasePath('projects') + $scope.project + '/playbooks/'; url = GetBasePath('projects') + $scope.project + '/playbooks/';
Rest.setUrl(url); Rest.setUrl(url);
Rest.get() Rest.get()
.success(function (data) { .then(({data}) => {
var i, opts = []; var i, opts = [];
for (i = 0; i < data.length; i++) { for (i = 0; i < data.length; i++) {
opts.push(data[i]); opts.push(data[i]);
@@ -172,7 +172,7 @@
if (oldValue !== newValue && !Empty($scope.project)) { if (oldValue !== newValue && !Empty($scope.project)) {
Rest.setUrl(GetBasePath('projects') + $scope.project + '/'); Rest.setUrl(GetBasePath('projects') + $scope.project + '/');
Rest.get() Rest.get()
.success(function (data) { .then(({data}) => {
var msg; var msg;
switch (data.status) { switch (data.status) {
case 'failed': case 'failed':
@@ -394,7 +394,7 @@
Rest.setUrl(GetBasePath("organizations")); Rest.setUrl(GetBasePath("organizations"));
Rest.get() Rest.get()
.success(function(data) { .then(({data}) => {
orgDefer.resolve(data.results[0].id); orgDefer.resolve(data.results[0].id);
}); });
@@ -434,7 +434,7 @@
Rest.post({ name: $scope.survey_name, Rest.post({ name: $scope.survey_name,
description: $scope.survey_description, description: $scope.survey_description,
spec: $scope.survey_questions }) spec: $scope.survey_questions })
.success(function () { .then(() => {
Wait('stop'); Wait('stop');
}) })
.error(function (data, .error(function (data,

12
awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js
View File

@@ -81,7 +81,7 @@ export default
Wait('start'); Wait('start');
Rest.setUrl(url); Rest.setUrl(url);
promises.push(Rest.get() promises.push(Rest.get()
.success(function (data) { .then(({data}) => {
$scope.disablePlaybookBecausePermissionDenied = false; $scope.disablePlaybookBecausePermissionDenied = false;
$scope.playbook_options = []; $scope.playbook_options = [];
var playbookNotFound = true; var playbookNotFound = true;
@@ -112,7 +112,7 @@ export default
Rest.setUrl(GetBasePath('projects') + $scope.project + '/'); Rest.setUrl(GetBasePath('projects') + $scope.project + '/');
promises.push(Rest.get() promises.push(Rest.get()
.success(function (data) { .then(({data}) => {
var msg; var msg;
switch (data.status) { switch (data.status) {
case 'failed': case 'failed':
@@ -539,7 +539,7 @@ export default
var getNext = function(data, arr, resolve) { var getNext = function(data, arr, resolve) {
Rest.setUrl(data.next); Rest.setUrl(data.next);
Rest.get() Rest.get()
.success(function (data) { .then(({data}) => {
if (data.next) { if (data.next) {
getNext(data, arr.concat(data.results), resolve); getNext(data, arr.concat(data.results), resolve);
} else { } else {
@@ -551,7 +551,7 @@ export default
Rest.setUrl(data.related.labels); Rest.setUrl(data.related.labels);
Rest.get() Rest.get()
.success(function(data) { .then(({data}) => {
if (data.next) { if (data.next) {
getNext(data, data.results, associatedLabelsDefer); getNext(data, data.results, associatedLabelsDefer);
} else { } else {
@@ -578,7 +578,7 @@ export default
Rest.setUrl(GetBasePath("organizations")); Rest.setUrl(GetBasePath("organizations"));
Rest.get() Rest.get()
.success(function(data) { .then(({data}) => {
orgDefer.resolve(data.results[0].id); orgDefer.resolve(data.results[0].id);
}); });
@@ -722,7 +722,7 @@ export default
Rest.setUrl(defaultUrl + $state.params.job_template_id); Rest.setUrl(defaultUrl + $state.params.job_template_id);
Rest.put(data) Rest.put(data)
.success(function (data) { .then(({data}) => {
$scope.$emit('templateSaveSuccess', data); $scope.$emit('templateSaveSuccess', data);
}) })
.error(function (data, status) { .error(function (data, status) {

6
awx/ui/client/src/templates/labels/labelsList.directive.js
View File

@@ -21,7 +21,7 @@ export default
var getNext = function(data, arr, resolve) { var getNext = function(data, arr, resolve) {
Rest.setUrl(data.next); Rest.setUrl(data.next);
Rest.get() Rest.get()
.success(function (data) { .then(({data}) => {
if (data.next) { if (data.next) {
getNext(data, arr.concat(data.results), resolve); getNext(data, arr.concat(data.results), resolve);
} else { } else {
@@ -34,7 +34,7 @@ export default
var seeMoreResolve = $q.defer(); var seeMoreResolve = $q.defer();
Rest.setUrl(scope[scope.$parent.list.iterator].related.labels); Rest.setUrl(scope[scope.$parent.list.iterator].related.labels);
Rest.get() Rest.get()
.success(function(data) { .then(({data}) => {
if (data.next) { if (data.next) {
getNext(data, data.results, seeMoreResolve); getNext(data, data.results, seeMoreResolve);
} else { } else {
@@ -71,7 +71,7 @@ export default
if(url) { if(url) {
Rest.setUrl(url); Rest.setUrl(url);
Rest.post({"disassociate": true, "id": label.id}) Rest.post({"disassociate": true, "id": label.id})
.success(function () { .then(() => {
Wait('stop'); Wait('stop');
$state.go('.', null, {reload: true}); $state.go('.', null, {reload: true});
}) })

2
awx/ui/client/src/templates/survey-maker/surveys/delete.factory.js
View File

@@ -41,7 +41,7 @@ export default
Rest.setUrl(url); Rest.setUrl(url);
Rest.destroy() Rest.destroy()
.success(function () { .then(() => {
scope.$emit("SurveyDeleted"); scope.$emit("SurveyDeleted");
}) })

2
awx/ui/client/src/templates/survey-maker/surveys/edit.factory.js
View File

@@ -31,7 +31,7 @@ export default
// Get the existing record // Get the existing record
Rest.setUrl(url); Rest.setUrl(url);
Rest.get() Rest.get()
.success(function (data) { .then(({data}) => {
if(!Empty(data)){ if(!Empty(data)){
ShowSurveyModal({ title: "Edit Survey", scope: scope, callback: 'DialogReady' }); ShowSurveyModal({ title: "Edit Survey", scope: scope, callback: 'DialogReady' });
scope.survey_name = data.name; scope.survey_name = data.name;

4
awx/ui/client/src/templates/survey-maker/surveys/init.factory.js
View File

@@ -81,7 +81,7 @@ export default
Rest.setUrl(GetBasePath('workflow_job_templates') + id + '/survey_spec/'); Rest.setUrl(GetBasePath('workflow_job_templates') + id + '/survey_spec/');
} }
return Rest.post({name: scope.survey_name, description: scope.survey_description, spec: scope.survey_questions }) return Rest.post({name: scope.survey_name, description: scope.survey_description, spec: scope.survey_questions })
.success(function () { .then(() => {
}) })
.error(function (data, status) { .error(function (data, status) {
@@ -98,7 +98,7 @@ export default
Rest.setUrl(GetBasePath('workflow_job_templates') + id+ '/'); Rest.setUrl(GetBasePath('workflow_job_templates') + id+ '/');
} }
return Rest.patch({"survey_enabled": scope.survey_enabled}) return Rest.patch({"survey_enabled": scope.survey_enabled})
.success(function () { .then(() => {
}) })
.error(function (data, status) { .error(function (data, status) {

4
awx/ui/client/src/templates/templates.service.js
View File

@@ -259,7 +259,7 @@ export default ['Rest', 'GetBasePath', '$q', 'NextPage', function(Rest, GetBaseP
Rest.setUrl(url); Rest.setUrl(url);
Rest.options() Rest.options()
.success(function(data) { .then(({data}) => {
deferred.resolve(data); deferred.resolve(data);
}).error(function(msg, code) { }).error(function(msg, code) {
deferred.reject(msg, code); deferred.reject(msg, code);
@@ -274,7 +274,7 @@ export default ['Rest', 'GetBasePath', '$q', 'NextPage', function(Rest, GetBaseP
Rest.setUrl(url); Rest.setUrl(url);
Rest.options() Rest.options()
.success(function(data) { .then(({data}) => {
deferred.resolve(data); deferred.resolve(data);
}).error(function(msg, code) { }).error(function(msg, code) {
deferred.reject(msg, code); deferred.reject(msg, code);

2
awx/ui/client/src/templates/workflows/add-workflow/workflow-add.controller.js
View File

@@ -112,7 +112,7 @@ export default [
Rest.setUrl(GetBasePath("organizations")); Rest.setUrl(GetBasePath("organizations"));
Rest.get() Rest.get()
.success(function(data) { .then(({data}) => {
orgDefer.resolve(data.results[0].id); orgDefer.resolve(data.results[0].id);
}); });

6
awx/ui/client/src/templates/workflows/edit-workflow/workflow-edit.controller.js
View File

@@ -181,7 +181,7 @@ export default [
var getNext = function(data, arr, resolve) { var getNext = function(data, arr, resolve) {
Rest.setUrl(data.next); Rest.setUrl(data.next);
Rest.get() Rest.get()
.success(function (data) { .then(({data}) => {
if (data.next) { if (data.next) {
getNext(data, arr.concat(data.results), resolve); getNext(data, arr.concat(data.results), resolve);
} else { } else {
@@ -193,7 +193,7 @@ export default [
Rest.setUrl($scope.workflow_job_template_obj.related.labels); Rest.setUrl($scope.workflow_job_template_obj.related.labels);
Rest.get() Rest.get()
.success(function(data) { .then(({data}) => {
if (data.next) { if (data.next) {
getNext(data, data.results, associatedLabelsDefer); getNext(data, data.results, associatedLabelsDefer);
} else { } else {
@@ -220,7 +220,7 @@ export default [
Rest.setUrl(GetBasePath("organizations")); Rest.setUrl(GetBasePath("organizations"));
Rest.get() Rest.get()
.success(function(data) { .then(({data}) => {
orgDefer.resolve(data.results[0].id); orgDefer.resolve(data.results[0].id);
}); });

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

@@ -37,7 +37,7 @@ export default ['$scope', '$rootScope', 'UserForm', 'GenerateForm', 'Rest',
Rest.setUrl(GetBasePath('users')); Rest.setUrl(GetBasePath('users'));
Rest.options() Rest.options()
.success(function(data) { .then(({data}) => {
if (!data.actions.POST) { if (!data.actions.POST) {
$state.go("^"); $state.go("^");
Alert(i18n._('Permission Error'), i18n._('You do not have permission to add a user.'), 'alert-info'); Alert(i18n._('Permission Error'), i18n._('You do not have permission to add a user.'), 'alert-info');
@@ -85,7 +85,7 @@ export default ['$scope', '$rootScope', 'UserForm', 'GenerateForm', 'Rest',
data.is_system_auditor = $scope.is_system_auditor; data.is_system_auditor = $scope.is_system_auditor;
Wait('start'); Wait('start');
Rest.post(data) Rest.post(data)
.success(function(data) { .then(({data}) => {
var base = $location.path().replace(/^\//, '').split('/')[0]; var base = $location.path().replace(/^\//, '').split('/')[0];
if (base === 'users') { if (base === 'users') {
$rootScope.flashMessage = i18n._('New user successfully created!'); $rootScope.flashMessage = i18n._('New user successfully created!');

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

@@ -38,7 +38,7 @@ export default ['$scope', '$rootScope', '$stateParams', 'UserForm', 'Rest',
$scope.$watch('is_superuser', hidePermissionsTabSmartSearchAndPaginationIfSuperUser($scope)); $scope.$watch('is_superuser', hidePermissionsTabSmartSearchAndPaginationIfSuperUser($scope));
Rest.setUrl(defaultUrl); Rest.setUrl(defaultUrl);
Wait('start'); Wait('start');
Rest.get(defaultUrl).success(function(data) { Rest.get(defaultUrl).then(({data}) => {
$scope.user_id = id; $scope.user_id = id;
$scope.ldap_user = (data.ldap_dn !== null && data.ldap_dn !== undefined && data.ldap_dn !== '') ? true : false; $scope.ldap_user = (data.ldap_dn !== null && data.ldap_dn !== undefined && data.ldap_dn !== '') ? true : false;
$scope.not_ldap_user = !$scope.ldap_user; $scope.not_ldap_user = !$scope.ldap_user;
@@ -172,7 +172,7 @@ export default ['$scope', '$rootScope', '$stateParams', 'UserForm', 'Rest',
if ($scope[form.name + '_form'].$valid) { if ($scope[form.name + '_form'].$valid) {
Rest.setUrl(defaultUrl + '/'); Rest.setUrl(defaultUrl + '/');
var data = processNewData(form.fields); var data = processNewData(form.fields);
Rest.put(data).success(function() { Rest.put(data).then(() => {
$state.go($state.current, null, { reload: true }); $state.go($state.current, null, { reload: true });
}) })
.error(function(data, status) { .error(function(data, status) {

2
awx/ui/client/src/users/list/users-list.controller.js
View File

@@ -62,7 +62,7 @@ export default ['$scope', '$rootScope', 'Rest', 'UserList', 'Prompt',
var url = defaultUrl + id + '/'; var url = defaultUrl + id + '/';
Rest.setUrl(url); Rest.setUrl(url);
Rest.destroy() Rest.destroy()
.success(function() { .then(() => {
let reloadListStateParams = null; let reloadListStateParams = null;

6
awx/ui/client/src/workflow-results/workflow-results.route.js
View File

@@ -51,7 +51,7 @@ export default {
var defer = $q.defer(); var defer = $q.defer();
Rest.setUrl(workflowData.related.workflow_nodes + '?order_by=id'); Rest.setUrl(workflowData.related.workflow_nodes + '?order_by=id');
Rest.get() Rest.get()
.success(function(data) { .then(({data}) => {
if(data.next) { if(data.next) {
let allNodes = data.results; let allNodes = data.results;
let getNodes = function(nextUrl){ let getNodes = function(nextUrl){
@@ -101,7 +101,7 @@ export default {
var getNext = function(data, arr, resolve) { var getNext = function(data, arr, resolve) {
Rest.setUrl(data.next); Rest.setUrl(data.next);
Rest.get() Rest.get()
.success(function (data) { .then(({data}) => {
if (data.next) { if (data.next) {
getNext(data, arr.concat(data.results), resolve); getNext(data, arr.concat(data.results), resolve);
} else { } else {
@@ -115,7 +115,7 @@ export default {
Rest.setUrl(GetBasePath('workflow_jobs') + $stateParams.id + '/labels/'); Rest.setUrl(GetBasePath('workflow_jobs') + $stateParams.id + '/labels/');
Rest.get() Rest.get()
.success(function(data) { .then(({data}) => {
if (data.next) { if (data.next) {
getNext(data, data.results, seeMoreResolve); getNext(data, data.results, seeMoreResolve);
} else { } else {

6
awx/ui/client/src/workflow-results/workflow-results.service.js
View File

@@ -45,7 +45,7 @@ export default ['$q', 'Prompt', '$filter', 'Wait', 'Rest', '$state', 'ProcessErr
Wait('start'); Wait('start');
Rest.setUrl(workflow.url); Rest.setUrl(workflow.url);
Rest.destroy() Rest.destroy()
.success(function() { .then(() => {
Wait('stop'); Wait('stop');
$('#prompt-modal').modal('hide'); $('#prompt-modal').modal('hide');
$state.go('jobs'); $state.go('jobs');
@@ -67,7 +67,7 @@ export default ['$q', 'Prompt', '$filter', 'Wait', 'Rest', '$state', 'ProcessErr
var doCancel = function() { var doCancel = function() {
Rest.setUrl(workflow.url + 'cancel'); Rest.setUrl(workflow.url + 'cancel');
Rest.post({}) Rest.post({})
.success(function() { .then(() => {
Wait('stop'); Wait('stop');
$('#prompt-modal').modal('hide'); $('#prompt-modal').modal('hide');
}) })
@@ -94,7 +94,7 @@ export default ['$q', 'Prompt', '$filter', 'Wait', 'Rest', '$state', 'ProcessErr
Wait('start'); Wait('start');
Rest.setUrl(workflow.url + 'cancel'); Rest.setUrl(workflow.url + 'cancel');
Rest.get() Rest.get()
.success(function(data) { .then(({data}) => {
if (data.can_cancel === true) { if (data.can_cancel === true) {
doCancel(); doCancel();
} else { } else {