Merge pull request #2429 from spadgett/fix-template-msg

Automatic merge from submit-queue. Fix bug where wrong next steps message can be displayed /assign @jwforres Fixes #2427
openshift · Nov 1, 2017 · 7fdc29a · 7fdc29a
2 parents 84d6d04 + 765acd8
commit 7fdc29a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/app/views/directives/process-template-dialog/process-template-results.html b/app/views/directives/process-template-dialog/process-template-results.html
@@ -1,5 +1,11 @@
 <div class="order-service-config">
+  <!--
+    Make sure we don't initialize the next-steps component until the wizard is
+    complete. Otherwise it tries to set and clear the template message too soon
+    (when the dialog is displayed, before the template is instantiated).
+  -->
   <next-steps
+    ng-if="$ctrl.wizardDone"
     project="$ctrl.selectedProject"
     project-name="$ctrl.selectedProject.metadata.name"
     login-base-url="$ctrl.loginBaseUrl"

diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js
@@ -9053,7 +9053,8 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
 
   $templateCache.put('views/directives/process-template-dialog/process-template-results.html',
     "<div class=\"order-service-config\">\n" +
-    "<next-steps project=\"$ctrl.selectedProject\" project-name=\"$ctrl.selectedProject.metadata.name\" login-base-url=\"$ctrl.loginBaseUrl\" on-continue=\"$ctrl.close\" show-project-name=\"$ctrl.showProjectName\" name=\"$ctrl.template | displayName\">\n" +
+    "\n" +
+    "<next-steps ng-if=\"$ctrl.wizardDone\" project=\"$ctrl.selectedProject\" project-name=\"$ctrl.selectedProject.metadata.name\" login-base-url=\"$ctrl.loginBaseUrl\" on-continue=\"$ctrl.close\" show-project-name=\"$ctrl.showProjectName\" name=\"$ctrl.template | displayName\">\n" +
     "</next-steps>\n" +
     "</div>"
   );