From cf38faa899043b89081ce31d7c0f7d55e7ea9438 Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Wed, 25 Apr 2018 11:41:20 -0400
Subject: [PATCH] Use string interpolation rather than passing action text in
 via a var

---
 awx/ui/client/src/scheduler/schedulerAdd.controller.js         | 3 +--
 awx/ui/client/src/scheduler/schedulerEdit.controller.js        | 2 +-
 awx/ui/client/src/scheduler/schedulerForm.partial.html         | 2 +-
 awx/ui/client/src/templates/prompt/prompt.directive.js         | 2 +-
 .../workflows/workflow-maker/workflow-maker.controller.js      | 2 --
 .../workflows/workflow-maker/workflow-maker.partial.html       | 2 +-
 6 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/awx/ui/client/src/scheduler/schedulerAdd.controller.js b/awx/ui/client/src/scheduler/schedulerAdd.controller.js
index 33d7a2a622..c00df03e27 100644
--- a/awx/ui/client/src/scheduler/schedulerAdd.controller.js
+++ b/awx/ui/client/src/scheduler/schedulerAdd.controller.js
@@ -33,6 +33,7 @@ export default ['$filter', '$state', '$stateParams', '$http', 'Wait',
     };
 
     $scope.preventCredsWithPasswords = true;
+    $scope.strings = TemplatesStrings;
 
     /*
      * This is a workaround for the angular-scheduler library inserting `ll` into fields after an
@@ -88,8 +89,6 @@ export default ['$filter', '$state', '$stateParams', '$http', 'Wait',
 
     $scope.hideForm = true;
 
-    $scope.promptActionText = TemplatesStrings.get('prompt.CONFIRM');
-
     // extra_data field is not manifested in the UI when scheduling a Management Job
     if ($state.current.name === 'jobTemplateSchedules.add'){
         $scope.parseType = 'yaml';
diff --git a/awx/ui/client/src/scheduler/schedulerEdit.controller.js b/awx/ui/client/src/scheduler/schedulerEdit.controller.js
index 8b1d3c083a..ec0a24842a 100644
--- a/awx/ui/client/src/scheduler/schedulerEdit.controller.js
+++ b/awx/ui/client/src/scheduler/schedulerEdit.controller.js
@@ -21,7 +21,7 @@ function($filter, $state, $stateParams, Wait, $scope, moment,
     $scope.hideForm = true;
     $scope.parseType = 'yaml';
 
-    $scope.promptActionText = TemplatesStrings.get('prompt.CONFIRM');
+    $scope.strings = TemplatesStrings;
 
     $scope.processSchedulerEndDt = function(){
         // set the schedulerEndDt to be equal to schedulerStartDt + 1 day @ midnight
diff --git a/awx/ui/client/src/scheduler/schedulerForm.partial.html b/awx/ui/client/src/scheduler/schedulerForm.partial.html
index 8930245501..9313db7f71 100644
--- a/awx/ui/client/src/scheduler/schedulerForm.partial.html
+++ b/awx/ui/client/src/scheduler/schedulerForm.partial.html
@@ -686,5 +686,5 @@
                 ng-disabled="!schedulerIsValid || promptModalMissingReqFields"> Save</button>
         </div>
     </div>
-    <prompt prompt-data="promptData" action-text="promptActionText"  prevent-creds-with-passwords="preventCredsWithPasswords"></prompt>
+    <prompt prompt-data="promptData" action-text="{{:: strings.get('prompt.CONFIRM')}}" prevent-creds-with-passwords="preventCredsWithPasswords"></prompt>
 </div>
diff --git a/awx/ui/client/src/templates/prompt/prompt.directive.js b/awx/ui/client/src/templates/prompt/prompt.directive.js
index b09a3bcc84..e151760bb7 100644
--- a/awx/ui/client/src/templates/prompt/prompt.directive.js
+++ b/awx/ui/client/src/templates/prompt/prompt.directive.js
@@ -5,7 +5,7 @@ export default [ 'templateUrl',
         scope: {
             promptData: '=',
             onFinish: '&',
-            actionText: '@actionText',
+            actionText: '@',
             preventCredsWithPasswords: '<'
         },
         templateUrl: templateUrl('templates/prompt/prompt'),
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 aa6a321f3b..a4119b4a79 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
@@ -16,8 +16,6 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
         $scope.strings = TemplatesStrings;
         $scope.preventCredsWithPasswords = true;
 
-        $scope.promptActionText = $scope.strings.get('prompt.CONFIRM');
-
         $scope.workflowMakerFormConfig = {
             nodeMode: "idle",
             activeTab: "jobs",
diff --git a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.partial.html b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.partial.html
index 3fa1abff37..aca4d30f13 100644
--- a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.partial.html
+++ b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.partial.html
@@ -129,5 +129,5 @@
         <button type="button" class="btn btn-sm WorkflowMaker-cancelButton" ng-click="closeWorkflowMaker()"> Close</button>
         <button type="button" class="btn btn-sm WorkflowMaker-saveButton" ng-click="saveWorkflowMaker()" ng-show="workflowJobTemplateObj.summary_fields.user_capabilities.edit || canAddWorkflowJobTemplate" ng-disabled="edgeFlags.conflict || workflowMakerFormConfig.nodeMode === 'add'"> Save</button>
     </div>
-    <prompt prompt-data="promptData" action-text="promptActionText"  prevent-creds-with-passwords="preventCredsWithPasswords"></prompt>
+    <prompt prompt-data="promptData" action-text="{{:: strings.get('prompt.CONFIRM')}}" prevent-creds-with-passwords="preventCredsWithPasswords"></prompt>
 </div>