Fixed jshint errors that fell out of merge conflict

ShaunBoughey · Nov 27, 2018 · 28a4bbb · 28a4bbb
1 parent 1cfcaa7
commit 28a4bbb
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 32 deletions.
diff --git a/awx/ui/client/src/templates/workflows/workflow-maker/forms/workflow-node-form.controller.js b/awx/ui/client/src/templates/workflows/workflow-maker/forms/workflow-node-form.controller.js
@@ -138,6 +138,36 @@ export default ['$scope', 'TemplatesService', 'JobTemplateModel', 'PromptService
             $scope.nodeFormDataLoaded = true;
         };
 
+        const getEditNodeHelpMessage = (selectedTemplate) => {
+            if (selectedTemplate.type === "workflow_job_template") {
+                if ($scope.workflowJobTemplateObj.inventory) {
+                    if (selectedTemplate.ask_inventory_on_launch) {
+                        return $scope.strings.get('workflow_maker.INVENTORY_WILL_OVERRIDE');
+                    }
+                }
+                 if ($scope.workflowJobTemplateObj.ask_inventory_on_launch) {
+                    if (selectedTemplate.ask_inventory_on_launch) {
+                        return $scope.strings.get('workflow_maker.INVENTORY_PROMPT_WILL_OVERRIDE');
+                    }
+                }
+            }
+             if (selectedTemplate.type === "job_template") {
+                if ($scope.workflowJobTemplateObj.inventory) {
+                    if (selectedTemplate.ask_inventory_on_launch) {
+                        return $scope.strings.get('workflow_maker.INVENTORY_WILL_OVERRIDE');
+                    }
+                     return $scope.strings.get('workflow_maker.INVENTORY_WILL_NOT_OVERRIDE');
+                }
+                 if ($scope.workflowJobTemplateObj.ask_inventory_on_launch) {
+                    if (selectedTemplate.ask_inventory_on_launch) {
+                        return $scope.strings.get('workflow_maker.INVENTORY_PROMPT_WILL_OVERRIDE');
+                    }
+                     return $scope.strings.get('workflow_maker.INVENTORY_PROMPT_WILL_NOT_OVERRIDE');
+                }
+            }
+             return null;
+        };
+
         const finishConfiguringEdit = () => {
 
             $scope.editNodeHelpMessage = getEditNodeHelpMessage($scope.nodeConfig.node.fullUnifiedJobTemplateObject);
@@ -394,36 +424,6 @@ export default ['$scope', 'TemplatesService', 'JobTemplateModel', 'PromptService
 
         };
 
-        const getEditNodeHelpMessage = (selectedTemplate) => {
-            if (selectedTemplate.type === "workflow_job_template") {
-                if ($scope.workflowJobTemplateObj.inventory) {
-                    if (selectedTemplate.ask_inventory_on_launch) {
-                        return $scope.strings.get('workflow_maker.INVENTORY_WILL_OVERRIDE');
-                    }
-                }
-                 if ($scope.workflowJobTemplateObj.ask_inventory_on_launch) {
-                    if (selectedTemplate.ask_inventory_on_launch) {
-                        return $scope.strings.get('workflow_maker.INVENTORY_PROMPT_WILL_OVERRIDE');
-                    }
-                }
-            }
-             if (selectedTemplate.type === "job_template") {
-                if ($scope.workflowJobTemplateObj.inventory) {
-                    if (selectedTemplate.ask_inventory_on_launch) {
-                        return $scope.strings.get('workflow_maker.INVENTORY_WILL_OVERRIDE');
-                    }
-                     return $scope.strings.get('workflow_maker.INVENTORY_WILL_NOT_OVERRIDE');
-                }
-                 if ($scope.workflowJobTemplateObj.ask_inventory_on_launch) {
-                    if (selectedTemplate.ask_inventory_on_launch) {
-                        return $scope.strings.get('workflow_maker.INVENTORY_PROMPT_WILL_OVERRIDE');
-                    }
-                     return $scope.strings.get('workflow_maker.INVENTORY_PROMPT_WILL_NOT_OVERRIDE');
-                }
-            }
-             return null;
-        };
-
         const templateManuallySelected = (selectedTemplate) => {
 
             if (promptWatcher) {

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
@@ -7,11 +7,11 @@
 export default ['$scope', 'TemplatesService',
     'ProcessErrors', 'CreateSelect2', '$q', 'JobTemplateModel',
     'Empty', 'PromptService', 'Rest', 'TemplatesStrings', 'WorkflowChartService',
-    'Wait',
+    'Wait', '$state',
     function ($scope, TemplatesService,
         ProcessErrors, CreateSelect2, $q, JobTemplate,
         Empty, PromptService, Rest, TemplatesStrings, WorkflowChartService,
-        Wait
+        Wait, $state
     ) {
 
         let deletedNodeIds = [];