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/03/03 16:55:41 UTC
[isis] branch master updated: ISIS-2877: regr.: blob/clob rendering fixes
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 76ea966 ISIS-2877: regr.: blob/clob rendering fixes
76ea966 is described below
commit 76ea96681fa08bd8b57cbe96caaf35370e2b59f0
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Mar 3 17:55:33 2022 +0100
ISIS-2877: regr.: blob/clob rendering fixes
---
.../viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java | 1 -
.../ui/components/scalars/ScalarPanelWithFormFieldAbstract.java | 3 +++
.../ui/components/scalars/blobclob/IsisBlobOrClobPanelAbstract.java | 5 +++++
3 files changed, 8 insertions(+), 1 deletion(-)
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 47e4d15..3fbc63a 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
@@ -332,7 +332,6 @@ implements ScalarModelSubscriber, HasScalarModel {
componentIfCompact = createComponentForCompact();
componentIfRegular.setVisible(false);
componentIfCompact.setVisible(true);
- Components.permanentlyHide(componentIfRegular, ID_SCALAR_NAME);
break;
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelWithFormFieldAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelWithFormFieldAbstract.java
index 36e3ca8..aa17489 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelWithFormFieldAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelWithFormFieldAbstract.java
@@ -106,6 +106,9 @@ extends ScalarPanelAbstract {
protected void onFormGroupCreated(final FormGroup formGroup) {
}
+ protected void onFormGroupNotCreated(final MarkupContainer emptyContainer) {
+ }
+
protected IValidator<Object> createValidator(final ScalarModel scalarModel) {
return new IValidator<Object>() {
private static final long serialVersionUID = 1L;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/blobclob/IsisBlobOrClobPanelAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/blobclob/IsisBlobOrClobPanelAbstract.java
index 18eae98..d02212b 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/blobclob/IsisBlobOrClobPanelAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/blobclob/IsisBlobOrClobPanelAbstract.java
@@ -116,6 +116,11 @@ extends ScalarPanelWithFormFieldAbstract<T> {
// Components.permanentlyHide(downloadLink, ID_FILE_NAME_IF_COMPACT);
// }
+ Components.permanentlyHide(getComponentForRegular(), ID_IMAGE);
+ Components.permanentlyHide(getComponentForRegular(), ID_SCALAR_NAME);
+ Components.permanentlyHide(getComponentForRegular(), ID_SCALAR_VALUE);
+ Components.permanentlyHide(getComponentForRegular(), "feedback");
+
return scalarIfCompact;
}