This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/causeway.git
The following commit(s) were added to refs/heads/master by this push:
new e5e1baac40 CAUSEWAY-3401: if can edit via action, don't display
disabled reason
e5e1baac40 is described below
commit e5e1baac4037995f92df2ca0f9938598f082eaa9
Author: andi-huber <[email protected]>
AuthorDate: Wed Apr 12 08:26:37 2023 +0200
CAUSEWAY-3401: if can edit via action, don't display disabled reason
- also removes colon in messages
---
.../java/org/apache/causeway/core/metamodel/consent/Consent.java | 4 ++--
...er_MixinDomainWithPdfJsViewer_IntegTest.dump_facets.approved.xml | 4 ++--
.../PdfjsViewer_MixinDomain_IntegTest.dump_facets.approved.xml | 4 ++--
...wer_PropDomainWithPdfjsViewer_IntegTest.dump_facets.approved.xml | 2 +-
.../PdfjsViewer_PropDomain_IntegTest.dump_facets.approved.xml | 2 +-
.../wicket/ui/components/scalars/ScalarPanelAdditionalButton.java | 6 ++++--
6 files changed, 12 insertions(+), 10 deletions(-)
diff --git
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/consent/Consent.java
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/consent/Consent.java
index 5cf3385d57..a92685258d 100644
---
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/consent/Consent.java
+++
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/consent/Consent.java
@@ -56,10 +56,10 @@ public interface Consent {
}
// -- PREDEFINED REASONS
public static VetoReason editingObjectDisabledReasonNotGiven() {
- return VetoReason.inferred("Disabled, via @DomainObject
annotation, reason not given.");
+ return VetoReason.inferred("Disabled via @DomainObject annotation,
reason not given.");
}
public static VetoReason editingPropertyDisabledReasonNotGiven() {
- return VetoReason.inferred("Disabled, via @Property annotation,
reason not given.");
+ return VetoReason.inferred("Disabled via @Property annotation,
reason not given.");
}
public static VetoReason propertyHasNoSetter() {
return VetoReason.inferred("Disabled, property has no setter.");
diff --git
a/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/PdfjsViewer_MixinDomainWithPdfJsViewer_IntegTest.dump_facets.approved.xml
b/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/PdfjsViewer_MixinDomainWithPdfJsViewer_IntegTest.dump_facets.approved.xml
index 20ff1c5fba..e7516cfb06 100644
---
a/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/PdfjsViewer_MixinDomainWithPdfJsViewer_IntegTest.dump_facets.approved.xml
+++
b/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/PdfjsViewer_MixinDomainWithPdfJsViewer_IntegTest.dump_facets.approved.xml
@@ -69,7 +69,7 @@
<mml:attr name="facet"
value="ImmutableFacetForDomainObjectAnnotationAsConfigured"/>
<mml:attr name="interactionAdvisors" value="DisablingOrEnabling"/>
<mml:attr name="precedence" value="DEFAULT"/>
- <mml:attr name="reason" value="Disabled, via @DomainObject annotation,
reason not given."/>
+ <mml:attr name="reason" value="Disabled via @DomainObject annotation,
reason not given."/>
</mml:facet>
<mml:facet
id="org.apache.causeway.core.metamodel.facets.object.objectvalidprops.ObjectValidPropertiesFacet"
fqcn="org.apache.causeway.core.metamodel.facets.object.objectvalidprops.impl.ObjectValidPropertiesFacetImpl">
<mml:attr name="facet" value="ObjectValidPropertiesFacetImpl"/>
@@ -984,7 +984,7 @@
<mml:attr name="facet"
value="ImmutableFacetForDomainObjectAnnotationAsConfigured"/>
<mml:attr name="interactionAdvisors" value="DisablingOrEnabling"/>
<mml:attr name="precedence" value="DEFAULT"/>
- <mml:attr name="reason" value="Disabled, via @DomainObject annotation,
reason not given."/>
+ <mml:attr name="reason" value="Disabled via @DomainObject annotation,
reason not given."/>
</mml:facet>
<mml:facet
id="org.apache.causeway.core.metamodel.facets.object.mixin.MixinFacet"
fqcn="org.apache.causeway.core.metamodel.facets.object.mixin.MixinFacetForDomainObjectAnnotation">
<mml:attr name="facet" value="MixinFacetForDomainObjectAnnotation"/>
diff --git
a/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/PdfjsViewer_MixinDomain_IntegTest.dump_facets.approved.xml
b/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/PdfjsViewer_MixinDomain_IntegTest.dump_facets.approved.xml
index 42349047eb..ee91db967c 100644
---
a/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/PdfjsViewer_MixinDomain_IntegTest.dump_facets.approved.xml
+++
b/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/PdfjsViewer_MixinDomain_IntegTest.dump_facets.approved.xml
@@ -69,7 +69,7 @@
<mml:attr name="facet"
value="ImmutableFacetForDomainObjectAnnotationAsConfigured"/>
<mml:attr name="interactionAdvisors" value="DisablingOrEnabling"/>
<mml:attr name="precedence" value="DEFAULT"/>
- <mml:attr name="reason" value="Disabled, via @DomainObject annotation,
reason not given."/>
+ <mml:attr name="reason" value="Disabled via @DomainObject annotation,
reason not given."/>
</mml:facet>
<mml:facet
id="org.apache.causeway.core.metamodel.facets.object.objectvalidprops.ObjectValidPropertiesFacet"
fqcn="org.apache.causeway.core.metamodel.facets.object.objectvalidprops.impl.ObjectValidPropertiesFacetImpl">
<mml:attr name="facet" value="ObjectValidPropertiesFacetImpl"/>
@@ -977,7 +977,7 @@
<mml:attr name="facet"
value="ImmutableFacetForDomainObjectAnnotationAsConfigured"/>
<mml:attr name="interactionAdvisors" value="DisablingOrEnabling"/>
<mml:attr name="precedence" value="DEFAULT"/>
- <mml:attr name="reason" value="Disabled, via @DomainObject annotation,
reason not given."/>
+ <mml:attr name="reason" value="Disabled via @DomainObject annotation,
reason not given."/>
</mml:facet>
<mml:facet
id="org.apache.causeway.core.metamodel.facets.object.mixin.MixinFacet"
fqcn="org.apache.causeway.core.metamodel.facets.object.mixin.MixinFacetForDomainObjectAnnotation">
<mml:attr name="facet" value="MixinFacetForDomainObjectAnnotation"/>
diff --git
a/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/PdfjsViewer_PropDomainWithPdfjsViewer_IntegTest.dump_facets.approved.xml
b/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/PdfjsViewer_PropDomainWithPdfjsViewer_IntegTest.dump_facets.approved.xml
index d811f14ba6..448433c954 100644
---
a/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/PdfjsViewer_PropDomainWithPdfjsViewer_IntegTest.dump_facets.approved.xml
+++
b/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/PdfjsViewer_PropDomainWithPdfjsViewer_IntegTest.dump_facets.approved.xml
@@ -69,7 +69,7 @@
<mml:attr name="facet"
value="ImmutableFacetForDomainObjectAnnotationAsConfigured"/>
<mml:attr name="interactionAdvisors" value="DisablingOrEnabling"/>
<mml:attr name="precedence" value="DEFAULT"/>
- <mml:attr name="reason" value="Disabled, via @DomainObject annotation,
reason not given."/>
+ <mml:attr name="reason" value="Disabled via @DomainObject annotation,
reason not given."/>
</mml:facet>
<mml:facet
id="org.apache.causeway.core.metamodel.facets.object.objectvalidprops.ObjectValidPropertiesFacet"
fqcn="org.apache.causeway.core.metamodel.facets.object.objectvalidprops.impl.ObjectValidPropertiesFacetImpl">
<mml:attr name="facet" value="ObjectValidPropertiesFacetImpl"/>
diff --git
a/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/PdfjsViewer_PropDomain_IntegTest.dump_facets.approved.xml
b/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/PdfjsViewer_PropDomain_IntegTest.dump_facets.approved.xml
index a06626d10f..f0de323ffd 100644
---
a/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/PdfjsViewer_PropDomain_IntegTest.dump_facets.approved.xml
+++
b/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/PdfjsViewer_PropDomain_IntegTest.dump_facets.approved.xml
@@ -69,7 +69,7 @@
<mml:attr name="facet"
value="ImmutableFacetForDomainObjectAnnotationAsConfigured"/>
<mml:attr name="interactionAdvisors" value="DisablingOrEnabling"/>
<mml:attr name="precedence" value="DEFAULT"/>
- <mml:attr name="reason" value="Disabled, via @DomainObject annotation,
reason not given."/>
+ <mml:attr name="reason" value="Disabled via @DomainObject annotation,
reason not given."/>
</mml:facet>
<mml:facet
id="org.apache.causeway.core.metamodel.facets.object.objectvalidprops.ObjectValidPropertiesFacet"
fqcn="org.apache.causeway.core.metamodel.facets.object.objectvalidprops.impl.ObjectValidPropertiesFacetImpl">
<mml:attr name="facet" value="ObjectValidPropertiesFacetImpl"/>
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelAdditionalButton.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelAdditionalButton.java
index 49733b1bf9..7851416f7a 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelAdditionalButton.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelAdditionalButton.java
@@ -27,7 +27,7 @@ import
org.apache.causeway.viewer.wicket.ui.components.scalars.ScalarPanelAbstra
/**
* In order of appearance in the UI.
- * XXX refactoring hint: whether or not buttons are visible should be answered
by the scalar (or meta-model) model itself
+ * XXX refactoring hint: whether or not buttons are visible should be answered
by the scalar-model (or meta-model) itself
*/
enum ScalarPanelAdditionalButton {
@@ -37,7 +37,8 @@ enum ScalarPanelAdditionalButton {
final ScalarModel scalarModel,
final RenderScenario renderScenario,
final FieldFragement fieldFragement) {
- return scalarModel.disabledReason()
+ return renderScenario!=RenderScenario.CAN_EDIT_INLINE_VIA_ACTION
+ && scalarModel.disabledReason()
.map(InteractionVeto::getVetoConsent)
.flatMap(Consent::getReason)
.map(VetoReason::showInUi)
@@ -51,6 +52,7 @@ enum ScalarPanelAdditionalButton {
final RenderScenario renderScenario,
final FieldFragement fieldFragement) {
return scalarModel.getSystemEnvironment().isPrototyping()
+ &&
renderScenario!=RenderScenario.CAN_EDIT_INLINE_VIA_ACTION
&& scalarModel.disabledReason()
.map(InteractionVeto::getVetoConsent)
.flatMap(Consent::getReason)
