From 630f428d770b45c75b492692a184c5502c2d7063 Mon Sep 17 00:00:00 2001 From: mabashian Date: Wed, 31 Jul 2019 11:38:47 -0400 Subject: [PATCH] Cleanup a few jshint errors --- awx/ui/client/src/app.js | 6 +++--- awx/ui/client/src/login/loginModal/loginModal.controller.js | 6 +++--- .../workflows/workflow-maker/workflow-maker.controller.js | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/awx/ui/client/src/app.js b/awx/ui/client/src/app.js index 21f0f8644e..5dac887aba 100644 --- a/awx/ui/client/src/app.js +++ b/awx/ui/client/src/app.js @@ -164,12 +164,12 @@ angular .run(['$q', '$cookies', '$rootScope', '$log', '$stateParams', 'CheckLicense', '$location', 'Authorization', 'LoadBasePaths', 'Timer', 'LoadConfig', 'Store', 'pendoService', 'Rest', - '$state', 'GetBasePath', 'ConfigService', + '$state', 'GetBasePath', 'ConfigService', 'ProcessErrors', 'SocketService', 'AppStrings', '$transitions', 'i18n', function($q, $cookies, $rootScope, $log, $stateParams, CheckLicense, $location, Authorization, LoadBasePaths, Timer, LoadConfig, Store, pendoService, Rest, - $state, GetBasePath, ConfigService, + $state, GetBasePath, ConfigService, ProcessErrors, SocketService, AppStrings, $transitions, i18n) { $rootScope.$state = $state; @@ -394,7 +394,7 @@ angular $rootScope.pendingApprovalCount = data.count; }) .catch(({data, status}) => { - ProcessErrors($scope, data, status, null, { + ProcessErrors({}, data, status, null, { hdr: i18n._('Error!'), msg: i18n._('Failed to get workflow jobs pending approval. GET returned status: ') + status }); diff --git a/awx/ui/client/src/login/loginModal/loginModal.controller.js b/awx/ui/client/src/login/loginModal/loginModal.controller.js index 8f9f9fc066..f47f3a70a8 100644 --- a/awx/ui/client/src/login/loginModal/loginModal.controller.js +++ b/awx/ui/client/src/login/loginModal/loginModal.controller.js @@ -39,11 +39,11 @@ * This is usage information. */ -export default ['$log', '$cookies', '$rootScope', +export default ['$log', '$cookies', '$rootScope', 'ProcessErrors', '$location', 'Authorization', 'Alert', 'Wait', 'Timer', 'Empty', '$scope', 'pendoService', 'ConfigService', 'CheckLicense', 'SocketService', 'Rest', 'GetBasePath', 'i18n', - function ($log, $cookies, $rootScope, + function ($log, $cookies, $rootScope, ProcessErrors, $location, Authorization, Alert, Wait, Timer, Empty, scope, pendoService, ConfigService, CheckLicense, SocketService, Rest, GetBasePath, i18n) { @@ -146,7 +146,7 @@ export default ['$log', '$cookies', '$rootScope', $rootScope.pendingApprovalCount = data.count; }) .catch(({data, status}) => { - ProcessErrors($scope, data, status, null, { + ProcessErrors({}, data, status, null, { hdr: i18n._('Error!'), msg: i18n._('Failed to get workflow jobs pending approval. GET returned status: ') + status }); diff --git a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js index 6de786a816..ea6f4eea01 100644 --- a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js +++ b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js @@ -221,7 +221,7 @@ export default ['$scope', 'TemplatesService', }); })); } else { - Rest.setUrl(newNodeData.related.create_approval_template); + Rest.setUrl(node.originalNodeObject.related.create_approval_template); approvalTemplatePromises.push(Rest.post({ name: node.unifiedJobTemplate.name, description: node.unifiedJobTemplate.description,