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 ed7641b22d ISIS-3215: fixes regression from commit
ed7641b22d is described below
commit ed7641b22d7510203265f2ba1d6557b045d05e86
Author: Andi Huber <[email protected]>
AuthorDate: Thu Sep 22 10:39:00 2022 +0200
ISIS-3215: fixes regression from commit
-
https://github.com/apache/isis/commit/352b08ba87e3244a7de1e49b74c06ebe77660370
---
.../viewer/wicket/ui/components/scalars/ScalarFragmentFactory.java | 4 ++--
.../wicket/ui/components/scalars/ScalarPanelFormFieldAbstract.html | 4 ++--
.../wicket/ui/components/scalars/ScalarPanelSelectAbstract.java | 6 ------
.../ui/components/scalars/choices/ChoicesSelect2PanelFactory.java | 7 ++++++-
.../ui/components/scalars/choices/ObjectChoicesSelect2Panel.java | 6 ++++++
.../ui/components/scalars/choices/ValueChoicesSelect2Panel.java | 6 ++++++
6 files changed, 22 insertions(+), 11 deletions(-)
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarFragmentFactory.java
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarFragmentFactory.java
index 7310f04348..443e40d226 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarFragmentFactory.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarFragmentFactory.java
@@ -184,8 +184,8 @@ public class ScalarFragmentFactory {
DATE("fragment-input-date"),
CHECKBOX("fragment-input-checkbox"),
FILE("fragment-input-file"),
- SELECT("fragment-input-select"),
- SELECT2("fragment-input-select2"),
+ SELECT_VALUE("fragment-input-select_value"),
+ SELECT_OBJECT("fragment-input-select_object"),
;
private final String fragmentId;
/**
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelFormFieldAbstract.html
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelFormFieldAbstract.html
index b4ce467fb9..48c24b1765 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelFormFieldAbstract.html
+++
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelFormFieldAbstract.html
@@ -143,12 +143,12 @@
class="form-control form-control-sm
scalarValue"/>
</wicket:fragment>
- <wicket:fragment wicket:id="fragment-input-select">
+ <wicket:fragment wicket:id="fragment-input-select_value">
<select wicket:id="scalarValue"
class="choices form-control-sm select2-remote"/>
</wicket:fragment>
- <wicket:fragment wicket:id="fragment-input-select2">
+ <wicket:fragment wicket:id="fragment-input-select_object">
<span wicket:id="entityLink" class="w-100">link or drop
down</span>
<span wicket:id="entityTitleIfNull">(none)</span>
</wicket:fragment>
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelectAbstract.java
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelectAbstract.java
index 55d6a6ed2a..32a513f67a 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelectAbstract.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelectAbstract.java
@@ -31,7 +31,6 @@ import org.apache.isis.core.metamodel.util.Facets;
import org.apache.isis.viewer.commons.model.components.UiString;
import org.apache.isis.viewer.commons.model.scalar.UiParameter;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
-import
org.apache.isis.viewer.wicket.ui.components.scalars.ScalarFragmentFactory.InputFragment;
import org.apache.isis.viewer.wicket.ui.components.widgets.select2.Select2;
import
org.apache.isis.viewer.wicket.ui.components.widgets.select2.providers.ChoiceProviderAbstract;
import org.apache.isis.viewer.wicket.ui.util.Wkt;
@@ -115,11 +114,6 @@ extends ScalarPanelFormFieldAbstract<ManagedObject> {
return UiString.text(select2.obtainOutputFormatModel().getObject());
}
- @Override
- protected final Optional<InputFragment> getInputFragmentType() {
- return Optional.of(InputFragment.SELECT2);
- }
-
// //////////////////////////////////////
/**
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/choices/ChoicesSelect2PanelFactory.java
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/choices/ChoicesSelect2PanelFactory.java
index 2b88d563d6..080a812dbf 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/choices/ChoicesSelect2PanelFactory.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/choices/ChoicesSelect2PanelFactory.java
@@ -21,7 +21,9 @@ package
org.apache.isis.viewer.wicket.ui.components.scalars.choices;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
+import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.viewer.commons.model.components.UiComponentType;
+import org.apache.isis.viewer.commons.model.scalar.UiScalar.ChoiceProviderSort;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.ComponentFactoryAbstract;
import
org.apache.isis.viewer.wicket.ui.components.scalars.string.ScalarTitleBadgePanel;
@@ -38,7 +40,10 @@ public class ChoicesSelect2PanelFactory extends
ComponentFactoryAbstract {
@Override
public ApplicationAdvice appliesTo(final IModel<?> model) {
- return appliesIf(model instanceof ScalarModel);
+ return appliesIf(_Casts.castTo(ScalarModel.class, model)
+ .map(ScalarModel::getChoiceProviderSort)
+ .map(ChoiceProviderSort::isChoicesAny)
+ .orElse(false));
}
@Override
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/choices/ObjectChoicesSelect2Panel.java
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/choices/ObjectChoicesSelect2Panel.java
index a4b5317ab0..023210955b 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/choices/ObjectChoicesSelect2Panel.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/choices/ObjectChoicesSelect2Panel.java
@@ -36,6 +36,7 @@ import
org.apache.isis.viewer.commons.model.components.UiComponentType;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import
org.apache.isis.viewer.wicket.ui.components.scalars.ScalarFragmentFactory.CompactFragment;
import
org.apache.isis.viewer.wicket.ui.components.scalars.ScalarFragmentFactory.FieldFrame;
+import
org.apache.isis.viewer.wicket.ui.components.scalars.ScalarFragmentFactory.InputFragment;
import
org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelSelectAbstract;
import
org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelSelectAbstract.ChoiceTitleHandler;
import
org.apache.isis.viewer.wicket.ui.components.widgets.entitysimplelink.EntityLinkSimplePanel;
@@ -97,6 +98,11 @@ implements ChoiceTitleHandler {
return entityLink;
}
+ @Override
+ protected final Optional<InputFragment> getInputFragmentType() {
+ return Optional.of(InputFragment.SELECT_OBJECT);
+ }
+
// -- ON BEFORE RENDER
@Override
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/choices/ValueChoicesSelect2Panel.java
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/choices/ValueChoicesSelect2Panel.java
index d9fe279748..3b40a56ca7 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/choices/ValueChoicesSelect2Panel.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/choices/ValueChoicesSelect2Panel.java
@@ -27,6 +27,7 @@ import org.apache.wicket.markup.html.form.FormComponent;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.metamodel.object.ManagedObject;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
+import
org.apache.isis.viewer.wicket.ui.components.scalars.ScalarFragmentFactory.InputFragment;
import
org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelSelectAbstract;
import
org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelSelectAbstract.ChoiceTitleHandler;
import
org.apache.isis.viewer.wicket.ui.components.widgets.select2.providers.ChoiceProviderForValues;
@@ -66,6 +67,11 @@ implements ChoiceTitleHandler {
return formComponent;
}
+ @Override
+ protected final Optional<InputFragment> getInputFragmentType() {
+ return Optional.of(InputFragment.SELECT_VALUE);
+ }
+
// --
@Override
