WICKET-5683 PreviousButton isEnabled() should bo logical conjunction of getWizardModel().isPreviousAvailable() and super.isEnabled()
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/47561dd9 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/47561dd9 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/47561dd9 Branch: refs/heads/wicket-6.x Commit: 47561dd9ed0eaf5cbe19cba33988366301579f82 Parents: 783c3be Author: adelbene <[email protected]> Authored: Wed Aug 27 18:27:37 2014 +0200 Committer: adelbene <[email protected]> Committed: Wed Aug 27 18:39:48 2014 +0200 ---------------------------------------------------------------------- .../java/org/apache/wicket/extensions/wizard/CancelButton.java | 2 +- .../java/org/apache/wicket/extensions/wizard/FinishButton.java | 3 ++- .../java/org/apache/wicket/extensions/wizard/LastButton.java | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/47561dd9/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/CancelButton.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/CancelButton.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/CancelButton.java index d288379..7830190 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/CancelButton.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/CancelButton.java @@ -55,7 +55,7 @@ public class CancelButton extends WizardButton @Override public final boolean isVisible() { - return getWizardModel().isCancelVisible(); + return getWizardModel().isCancelVisible() && super.isVisible(); } /** http://git-wip-us.apache.org/repos/asf/wicket/blob/47561dd9/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/FinishButton.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/FinishButton.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/FinishButton.java index ae157d4..be62df0 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/FinishButton.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/FinishButton.java @@ -46,7 +46,8 @@ public class FinishButton extends WizardButton public boolean isEnabled() { IWizardStep activeStep = getWizardModel().getActiveStep(); - return ((activeStep != null) && getWizardModel().isLastStep(activeStep)); + return (activeStep != null) && getWizardModel().isLastStep(activeStep) + && super.isEnabled(); } /** http://git-wip-us.apache.org/repos/asf/wicket/blob/47561dd9/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/LastButton.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/LastButton.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/LastButton.java index 5c47e18..5fad4d4 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/LastButton.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/LastButton.java @@ -46,7 +46,7 @@ public class LastButton extends WizardButton @Override public boolean isEnabled() { - return getWizardModel().isLastAvailable(); + return getWizardModel().isLastAvailable() && super.isEnabled(); } /** @@ -55,7 +55,7 @@ public class LastButton extends WizardButton @Override public boolean isVisible() { - return getWizardModel().isLastVisible(); + return getWizardModel().isLastVisible() && super.isVisible(); } /**
