Skip to content

Commit 5bd2d52

Browse files
Merge pull request #2471 from spadgett/deploy-image-btn-disabled
Automatic merge from submit-queue. Correctly disable Deploy button Fix the Deploy button being enabled at the wrong time in the Deploy Image dialog. Fixes #2469 /kind bug /assign @jwforres @dtaylor113 @jeff-phillips-18
2 parents b3bc208 + 5638436 commit 5bd2d52

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

app/views/directives/deploy-image-dialog.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,15 @@
1010
on-step-changed="$ctrl.stepChanged(step)"
1111
step-class="order-service-wizard-step"
1212
wizard-done="$ctrl.wizardDone">
13+
<!-- Make sure next-enabled evaluates as a boolean since angular-patternfly will enable the button on undefined. -->
1314
<pf-wizard-step
1415
step-title="Image"
1516
step-id="image"
1617
step-priority="1"
1718
substeps="false"
1819
ok-to-nav-away="true"
1920
allow-click-nav="false"
20-
next-enabled="$ctrl.deployForm.$valid || $ctrl.deployImageNewAppCreated">
21+
next-enabled="!!($ctrl.deployForm.$valid || $ctrl.deployImageNewAppCreated)">
2122
<div class="wizard-pf-main-inner-shadow-covers">
2223
<div class="order-service-config">
2324
<div class="wizard-pf-main-form-contents">

dist/scripts/templates.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6299,7 +6299,8 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
62996299

63006300
$templateCache.put('views/directives/deploy-image-dialog.html',
63016301
"<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" +
6302-
"<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" +
6302+
"\n" +
6303+
"<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" +
63036304
"<div class=\"wizard-pf-main-inner-shadow-covers\">\n" +
63046305
"<div class=\"order-service-config\">\n" +
63056306
"<div class=\"wizard-pf-main-form-contents\">\n" +

0 commit comments

Comments
 (0)