You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2018/09/20 19:57:34 UTC
[isis] branch v2 updated: ISIS-1920: fixes show all disabled
reasons on members except 'Always disabled'
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/v2 by this push:
new 6b9a5bb ISIS-1920: fixes show all disabled reasons on members except 'Always disabled'
6b9a5bb is described below
commit 6b9a5bb18d5ce9aae5bbe8c66f809af8a342c9d2
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Sep 20 21:57:27 2018 +0200
ISIS-1920: fixes show all disabled reasons on members except 'Always
disabled'
Task-Url: https://issues.apache.org/jira/browse/ISIS-1920
---
.../isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java | 2 +-
.../isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
index d7db095..d06bab9 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
@@ -179,7 +179,7 @@ public abstract class ScalarPanelAbstract extends PanelAbstract<ScalarModel> imp
final String disableReasonIfAny = scalarModel.whetherDisabled();
if (disableReasonIfAny != null) {
- if("Always disabled".equals(disableReasonIfAny)) {
+ if(disableReasonIfAny.contains("Always disabled")) {
onBeforeRenderWhenViewMode();
} else {
onBeforeRenderWhenDisabled(disableReasonIfAny.toString());
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
index 235f638..d1dd3dd 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
@@ -188,7 +188,7 @@ public abstract class ScalarPanelAbstract2 extends PanelAbstract<ScalarModel> im
final String disableReasonIfAny = scalarModel.whetherDisabled();
if (disableReasonIfAny != null) {
- if("Always disabled".equals(disableReasonIfAny)) {
+ if(disableReasonIfAny.contains("Always disabled")) {
onInitializeWhenViewMode();
} else {
onInitializeWhenDisabled(disableReasonIfAny.toString());