You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2013/05/27 17:11:40 UTC

[2/2] git commit: WICKET-5204 The DateTimeField.onBeforeRender() method does not format the fields correctly.

WICKET-5204 The DateTimeField.onBeforeRender() method does not format the fields correctly.


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/7d15c838
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/7d15c838
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/7d15c838

Branch: refs/heads/wicket-6.x
Commit: 7d15c8382f10bd140bd49cb28c39e402e9de72bb
Parents: faa6f93
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon May 27 18:11:10 2013 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon May 27 18:11:10 2013 +0300

----------------------------------------------------------------------
 .../extensions/yui/calendar/DateTimeField.java     |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/7d15c838/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
----------------------------------------------------------------------
diff --git a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
index 2534f48..13b9cb8 100644
--- a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
+++ b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
@@ -435,19 +435,15 @@ public class DateTimeField extends FormComponentPanel<Date>
 		}
 		else
 		{
-			MutableDateTime mDate;
+			MutableDateTime mDate = new MutableDateTime(modelObject);
 			// convert date to the client's time zone if we have that info
 			TimeZone zone = getClientTimeZone();
 			if (zone != null)
 			{
-				mDate = new MutableDateTime(modelObject, DateTimeZone.forTimeZone(zone));
-			}
-			else
-			{
-				mDate = new MutableDateTime(modelObject);
+				mDate.setZone(DateTimeZone.forTimeZone(zone));
 			}
 
-			date = mDate.toDate();
+			date = mDate.toDateTime().toLocalDate().toDate();
 
 			if (use12HourFormat)
 			{