You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by vd...@apache.org on 2013/06/04 14:05:07 UTC
svn commit: r1489395 -
/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
Author: vdegtyarev
Date: Tue Jun 4 12:05:07 2013
New Revision: 1489395
URL: http://svn.apache.org/r1489395
Log:
OPENMEETINGS-658 is fixed
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/CalendarPanel.java?rev=1489395&r1=1489394&r2=1489395&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/CalendarPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/CalendarPanel.java Tue Jun 4 12:05:07 2013
@@ -134,9 +134,10 @@ public class CalendarPanel extends UserP
if (CalendarView.month == view && start.equals(end)) {
java.util.Calendar now = WebSession.getCalendar();
java.util.Calendar cal = WebSession.getCalendar();
- cal.setTime(start);
- cal.set(java.util.Calendar.HOUR, now.get(java.util.Calendar.HOUR));
- cal.set(java.util.Calendar.MINUTE, now.get(java.util.Calendar.MINUTE));
+ now.setTime(start);
+ cal.set(java.util.Calendar.YEAR, now.get(java.util.Calendar.YEAR));
+ cal.set(java.util.Calendar.MONTH, now.get(java.util.Calendar.MONTH));
+ cal.set(java.util.Calendar.DATE, now.get(java.util.Calendar.DATE));
cal.set(java.util.Calendar.SECOND, 0);
cal.set(java.util.Calendar.MILLISECOND, 0);
a.setAppointmentStarttime(cal.getTime());