Skip to content

Commit

Permalink
Merge pull request #2471 from spadgett/deploy-image-btn-disabled
Browse files Browse the repository at this point in the history
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
  • Loading branch information
openshift-merge-robot authored Nov 7, 2017
2 parents b3bc208 + 5638436 commit 5bd2d52
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion app/views/directives/deploy-image-dialog.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,15 @@
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"
step-priority="1"
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">
Expand Down
3 changes: 2 additions & 1 deletion dist/scripts/templates.js
Original file line number Diff line number Diff line change
Expand Up @@ -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" +
Expand Down

0 comments on commit 5bd2d52

Please sign in to comment.