You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2017/09/18 07:38:38 UTC
isis git commit: ISIS-1707: suppresses mandatory indicator ("red
star") for read-only properties.
Repository: isis
Updated Branches:
refs/heads/master c412d34c1 -> 81a7a462a
ISIS-1707: suppresses mandatory indicator ("red star") for read-only properties.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/81a7a462
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/81a7a462
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/81a7a462
Branch: refs/heads/master
Commit: 81a7a462a44f52631019f90ddf49ad4192158ca3
Parents: c412d34
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Sep 18 08:38:20 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Sep 18 08:38:20 2017 +0100
----------------------------------------------------------------------
.../wicket/ui/components/scalars/ScalarPanelAbstract2.java | 5 +++--
.../ui/components/scalars/ScalarPanelSelect2Abstract.java | 3 ++-
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/81a7a462/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
----------------------------------------------------------------------
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 51f83d8..8678ea0 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
@@ -559,13 +559,14 @@ public abstract class ScalarPanelAbstract2 extends PanelAbstract<ScalarModel> im
protected Label createScalarName(final String id, final String labelCaption) {
final Label scalarName = new Label(id, labelCaption);
- if(getModel().isRequired()) {
+ final ScalarModel model = getModel();
+ if(model.isRequired() && model.canEnterEditMode()) {
final String label = scalarName.getDefaultModelObjectAsString();
if(!Strings.isNullOrEmpty(label)) {
scalarName.add(new CssClassAppender("mandatory"));
}
}
- NamedFacet namedFacet = getModel().getFacet(NamedFacet.class);
+ NamedFacet namedFacet = model.getFacet(NamedFacet.class);
if (namedFacet != null) {
scalarName.setEscapeModelStrings(namedFacet.escaped());
}
http://git-wip-us.apache.org/repos/asf/isis/blob/81a7a462/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelect2Abstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelect2Abstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelect2Abstract.java
index 917c413..4cf733f 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelect2Abstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelect2Abstract.java
@@ -97,7 +97,8 @@ public abstract class ScalarPanelSelect2Abstract extends ScalarPanelAbstract2 {
addStandardSemantics();
- if(getModel().isRequired()) {
+ final ScalarModel model = getModel();
+ if(model.isRequired() && model.canEnterEditMode()) {
formGroup.add(new CssClassAppender("mandatory"));
}
return formGroup;