From 5638436be654797379b72c2db288f29d68905767 Mon Sep 17 00:00:00 2001
From: Samuel Padgett <spadgett@redhat.com>
Date: Tue, 7 Nov 2017 16:19:12 -0500
Subject: [PATCH] Correctly disable Deploy button

Fix the Deploy button being enabled at the wrong time in the Deploy Image dialog.
---
 app/views/directives/deploy-image-dialog.html | 3 ++-
 dist/scripts/templates.js                     | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/views/directives/deploy-image-dialog.html b/app/views/directives/deploy-image-dialog.html
index d555145867..d09b921906 100644
--- a/app/views/directives/deploy-image-dialog.html
+++ b/app/views/directives/deploy-image-dialog.html
@@ -10,6 +10,7 @@
      on-step-changed="$ctrl.stepChanged(step)"
      step-class="order-service-wizard-step"
      wizard-done="$ctrl.wizardDone">
+  <!-- Make sure next-enabled evaluates as a boolean since angular-patternfly will enable the button on undefined. -->
   <pf-wizard-step
        step-title="Image"
        step-id="image"
@@ -17,7 +18,7 @@
        substeps="false"
        ok-to-nav-away="true"
        allow-click-nav="false"
-       next-enabled="$ctrl.deployForm.$valid || $ctrl.deployImageNewAppCreated">
+       next-enabled="!!($ctrl.deployForm.$valid || $ctrl.deployImageNewAppCreated)">
     <div class="wizard-pf-main-inner-shadow-covers">
       <div class="order-service-config">
         <div class="wizard-pf-main-form-contents">
diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js
index 0557b68477..4bab0f1a72 100644
--- a/dist/scripts/templates.js
+++ b/dist/scripts/templates.js
@@ -6299,7 +6299,8 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
 
   $templateCache.put('views/directives/deploy-image-dialog.html',
     "<pf-wizard wizard-title=\"Deploy Image\" on-cancel=\"$ctrl.close()\" on-finish=\"$ctrl.close()\" hide-back-button=\"true\" hide-sidebar=\"true\" next-title=\"$ctrl.nextButtonTitle\" next-callback=\"$ctrl.nextCallback\" current-step=\"$ctrl.currentStep\" on-step-changed=\"$ctrl.stepChanged(step)\" step-class=\"order-service-wizard-step\" wizard-done=\"$ctrl.wizardDone\">\n" +
-    "<pf-wizard-step step-title=\"Image\" step-id=\"image\" step-priority=\"1\" substeps=\"false\" ok-to-nav-away=\"true\" allow-click-nav=\"false\" next-enabled=\"$ctrl.deployForm.$valid || $ctrl.deployImageNewAppCreated\">\n" +
+    "\n" +
+    "<pf-wizard-step step-title=\"Image\" step-id=\"image\" step-priority=\"1\" substeps=\"false\" ok-to-nav-away=\"true\" allow-click-nav=\"false\" next-enabled=\"!!($ctrl.deployForm.$valid || $ctrl.deployImageNewAppCreated)\">\n" +
     "<div class=\"wizard-pf-main-inner-shadow-covers\">\n" +
     "<div class=\"order-service-config\">\n" +
     "<div class=\"wizard-pf-main-form-contents\">\n" +