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 2022/05/13 12:38:52 UTC
[isis] branch master updated: ISIS-3050: badge render fix
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 7bc00d64a2 ISIS-3050: badge render fix
7bc00d64a2 is described below
commit 7bc00d64a23c251555c9d68ac1f38ca9f1a11ce4
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri May 13 14:38:46 2022 +0200
ISIS-3050: badge render fix
---
.../viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java | 3 +--
.../viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java | 3 ++-
.../wicket/ui/components/scalars/string/ScalarTitleBadgePanel.java | 7 +++++++
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
index 51c7c04d7f..ce3ccaab5b 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
@@ -85,13 +85,12 @@ implements ScalarModelSubscriber {
protected static final String ID_SCALAR_VALUE = "scalarValue";
public enum FormatModifier {
- //READONLY,
MARKUP,
MULITLINE,
COMPOSITE,
TRISTATE,
- //FLEX,
BLOB,
+ BADGE
}
public enum Repaint {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
index 5b15e560ab..f177cc1e3e 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
@@ -152,11 +152,12 @@ extends ScalarPanelAbstract {
/**
* Output format (usually HTML) as String, for any non editing scenario.
* <p>
- * Usually HTML, except for (non-empty) text-areas.
+ * Usually HTML, except for (non-empty) text-areas or badges (that are already modeled in HTML).
*/
protected String obtainOutputFormat() {
return _Strings.nonEmpty(
isUsingTextarea()
+ || getFormatModifiers().contains(FormatModifier.BADGE)
? scalarModel().proposedValue().getValueAsTitle().getValue()
: scalarModel().proposedValue().getValueAsHtml().getValue())
.orElseGet(()->
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/ScalarTitleBadgePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/ScalarTitleBadgePanel.java
index 76ad1faefb..225b026b20 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/ScalarTitleBadgePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/ScalarTitleBadgePanel.java
@@ -18,6 +18,8 @@
*/
package org.apache.isis.viewer.wicket.ui.components.scalars.string;
+import java.util.EnumSet;
+
import org.apache.wicket.Component;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
@@ -38,6 +40,11 @@ public class ScalarTitleBadgePanel<T> extends ScalarPanelTextFieldWithValueSeman
super(id, scalarModel, type);
}
+ @Override
+ protected void setupFormatModifiers(final EnumSet<FormatModifier> modifiers) {
+ modifiers.add(FormatModifier.BADGE);
+ }
+
@Override
protected Component createComponentForOutput(final String id) {
return CompactFragment.BADGE.createFragment(id, this, scalarValueId->