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 2021/11/11 15:58:54 UTC
[isis] branch master updated: ISIS-2877: restrict param assoc.
actions to scalar value-type
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/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 2ceaa60 ISIS-2877: restrict param assoc. actions to scalar value-type
2ceaa60 is described below
commit 2ceaa6015f6b9c35474e3cb151c0516874270f42
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Nov 11 16:58:46 2021 +0100
ISIS-2877: restrict param assoc. actions to scalar value-type
---
.../ui/components/actionmenu/entityactions/LinkAndLabelFactory.java | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/LinkAndLabelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/LinkAndLabelFactory.java
index 1af9b10..f077f2c 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/LinkAndLabelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/LinkAndLabelFactory.java
@@ -112,6 +112,12 @@ extends Function<ObjectAction, LinkAndLabel> {
public static LinkAndLabelFactory forParameter(
final ScalarParameterModel parameterModel) {
+ // only supported, when parameter type is scalar and also is a value-type
+ if(!parameterModel.getMetaModel().isScalar()
+ || !parameterModel.getMetaModel().getElementType().isValue()) {
+ return action -> null;
+ }
+
val linkFactory = new AdditionalLinkFactory();
return action -> LinkAndLabel.of(