You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by sv...@apache.org on 2017/10/17 20:44:34 UTC
[20/20] wicket git commit: WICKET-6348 minor addition: update raw
input when component is not contained in form this wasn't done in 7.x either,
but for consistency the raw input should be updated,
so it is available when a validation fails
WICKET-6348 minor addition: update raw input when component is not contained in form
this wasn't done in 7.x either, but for consistency the raw input should be updated, so it is available when a validation fails
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/9e028af3
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/9e028af3
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/9e028af3
Branch: refs/heads/master
Commit: 9e028af34cc432ddbffd6e09e82bf46d6226c0c8
Parents: 1176c0a
Author: Sven Meier <sv...@apache.org>
Authored: Tue Oct 17 21:25:18 2017 +0200
Committer: Sven Meier <sv...@apache.org>
Committed: Tue Oct 17 22:40:30 2017 +0200
----------------------------------------------------------------------
.../markup/html/form/FormComponentUpdatingBehavior.java | 5 +++++
.../html/form/datetime/ZonedToLocalDateTimeModel.java | 11 +----------
2 files changed, 6 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/9e028af3/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponentUpdatingBehavior.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponentUpdatingBehavior.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponentUpdatingBehavior.java
index 0d5f410..d913e77 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponentUpdatingBehavior.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponentUpdatingBehavior.java
@@ -233,6 +233,10 @@ public class FormComponentUpdatingBehavior extends Behavior implements IRequestL
Form<?> form = formComponent.findParent(Form.class);
if (form == null)
{
+ // let form component change its input, so it is available
+ // in case of any errors
+ formComponent.inputChanged();
+
process();
}
else
@@ -264,6 +268,7 @@ public class FormComponentUpdatingBehavior extends Behavior implements IRequestL
@Override
public boolean getDefaultFormProcessing()
{
+ // do not process the whole form
return false;
}
});
http://git-wip-us.apache.org/repos/asf/wicket/blob/9e028af3/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/ZonedToLocalDateTimeModel.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/ZonedToLocalDateTimeModel.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/ZonedToLocalDateTimeModel.java
index 4571b36..e4b27de 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/ZonedToLocalDateTimeModel.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/ZonedToLocalDateTimeModel.java
@@ -24,7 +24,6 @@ import java.util.TimeZone;
import org.apache.wicket.Session;
import org.apache.wicket.core.request.ClientInfo;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
import org.apache.wicket.protocol.http.request.WebClientInfo;
import org.apache.wicket.settings.RequestCycleSettings;
import org.apache.wicket.util.lang.Args;
@@ -108,12 +107,4 @@ public class ZonedToLocalDateTimeModel implements IModel<LocalDateTime>
model.setObject(dateTime.atZone(getClientTimeZone()).withZoneSameInstant(getTargetTimeZone()));
}
}
-
- /**
- * Convenience factory for a date time.
- */
- public static IModel<LocalDateTime> of(ZonedDateTime dateTime)
- {
- return new ZonedToLocalDateTimeModel(new Model<ZonedDateTime>(dateTime));
- }
-}
+}
\ No newline at end of file