Fixed variable changing bugs.

svn changeset:3927/svn branch:trunk

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/CalendarPanel.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/CalendarPanel.java
index bcf897696e01810cbd810083d230f8daabd56533..f7bb56d312ff7ef3bb151e0c792ee35482af26db 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/CalendarPanel.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/CalendarPanel.java
@@ -290,6 +290,19 @@ public class CalendarPanel extends FlexTable implements MouseListener,
             showingDate.setMonth(showingDate.getMonth() + 1);\r
             updateCalendar();\r
         }\r
+        if (datefield.getCurrentResolution() == IDateField.RESOLUTION_YEAR\r
+                || datefield.getCurrentResolution() == IDateField.RESOLUTION_MONTH) {\r
+            // Due to current UI, update variable if res=year/month\r
+            datefield.setCurrentDate(new Date(showingDate.getTime()));\r
+            if (datefield.getCurrentResolution() == IDateField.RESOLUTION_MONTH) {\r
+                datefield.getClient().updateVariable(datefield.getId(),\r
+                        "month", datefield.getCurrentDate().getMonth() + 1,\r
+                        false);\r
+            }\r
+            datefield.getClient().updateVariable(datefield.getId(), "year",\r
+                    datefield.getCurrentDate().getYear() + 1900,\r
+                    datefield.isImmediate());\r
+        }\r
     }\r
 \r
     private Timer timer;\r
@@ -393,7 +406,13 @@ public class CalendarPanel extends FlexTable implements MouseListener,
                 }\r
                 cal.datefield.getCurrentDate().setTime(newDate.getTime());\r
                 cal.datefield.getClient().updateVariable(cal.datefield.getId(),\r
-                        "day", cal.datefield.getCurrentDate().getDate(),\r
+                        "day", cal.datefield.getCurrentDate().getDate(), false);\r
+                cal.datefield.getClient().updateVariable(cal.datefield.getId(),\r
+                        "month", cal.datefield.getCurrentDate().getMonth() + 1,\r
+                        false);\r
+                cal.datefield.getClient().updateVariable(cal.datefield.getId(),\r
+                        "year",\r
+                        cal.datefield.getCurrentDate().getYear() + 1900,\r
                         cal.datefield.isImmediate());\r
 \r
                 updateCalendar();\r