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/09/22 05:35:45 UTC
[isis] branch master updated: ISIS-3201: fixes time-picker commit from earlier this day
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 ec579e9f24 ISIS-3201: fixes time-picker commit from earlier this day
ec579e9f24 is described below
commit ec579e9f24dba17a1671b8a80ed4fefc01609a0c
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Sep 22 07:35:40 2022 +0200
ISIS-3201: fixes time-picker commit from earlier this day
---
.../ScalarPanelTextFieldWithTemporalPicker.java | 34 ++++++++++++----------
.../widgets/select2/Select2OnSelect.java | 1 +
2 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldWithTemporalPicker.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldWithTemporalPicker.java
index b97b72b9a4..6824a66e28 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldWithTemporalPicker.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldWithTemporalPicker.java
@@ -51,29 +51,15 @@ extends ScalarPanelTextFieldWithValueSemantics<T> {
@Override
protected final TextField<T> createTextField(final String id) {
val scalarModel = scalarModel();
- return new TextFieldWithDateTimePicker<T>(
+ val textField = new TextFieldWithDateTimePicker<T>(
id, scalarModel, type, getConverter(scalarModel));
- }
-
- protected final TextField<T> getTextField() {
- return (TextField<T>)getFormComponent();
- }
-
- @Override
- protected Optional<InputFragment> getInputFragmentType() {
- return Optional.of(InputFragment.DATE);
- }
-
- @Override
- protected void installScalarModelChangeBehavior() {
- //super.installScalarModelChangeBehavior(); // don't install the default change listener
/* [ISIS-3201]
* Adding OnChangeAjaxBehavior registers a JavaScript event listener on change events.
* Since OnChangeAjaxBehavior extends AjaxFormComponentUpdatingBehavior the Ajax request
* also updates the Wicket model for this form component on the server side.
*/
- getTextField().add(new OnChangeAjaxBehavior() {
+ textField.add(new OnChangeAjaxBehavior() {
private static final long serialVersionUID = 1L;
@Override
protected void onUpdate(final AjaxRequestTarget target) {
@@ -82,6 +68,22 @@ extends ScalarPanelTextFieldWithValueSemantics<T> {
.getScalarModelChangeDispatcher().notifyUpdate(target);
}
});
+
+ return textField;
+ }
+
+ protected final TextField<T> getTextField() {
+ return (TextField<T>)getFormComponent();
+ }
+
+ @Override
+ protected Optional<InputFragment> getInputFragmentType() {
+ return Optional.of(InputFragment.DATE);
+ }
+
+ @Override
+ protected void installScalarModelChangeBehavior() {
+ // don't install the default change listener, instead OnChangeAjaxBehavior is installed above
}
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2OnSelect.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2OnSelect.java
index 133b26f5ee..d53250f87a 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2OnSelect.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2OnSelect.java
@@ -158,6 +158,7 @@ class Select2OnSelect extends AbstractAjaxBehavior {
WebApplication app = (WebApplication)getComponent().getApplication();
AjaxRequestTarget target = app.newAjaxRequestTarget(getComponent().getPage());
+ // triggers update of dependent args (action prompt)
select2ChangeDispatcher.notifyUpdate(target);
RequestCycle requestCycle = RequestCycle.get();