SAK-2654 - Add selected day's date as default date for new events in …

…Calendar (sakaiproject#6033)
axxter99 · Sep 25, 2018 · 548fbb6 · 548fbb6
1 parent 41f1bb2
commit 548fbb6
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/calendar/calendar-tool/tool/src/java/org/sakaiproject/calendar/tool/CalendarAction.java b/calendar/calendar-tool/tool/src/java/org/sakaiproject/calendar/tool/CalendarAction.java
@@ -3851,6 +3851,16 @@ protected void buildNewContext(VelocityPortlet portlet,
 
 			String peid = ((JetspeedRunData)runData).getJs_peid();
 			SessionState sstate = ((JetspeedRunData)runData).getPortletSessionState(peid);
+
+			if ((sstate.getAttribute(STATE_YEAR) != null) && (sstate.getAttribute(STATE_MONTH) != null) && (sstate.getAttribute(STATE_DAY) != null))
+			{
+				int stateYear = ((Integer)sstate.getAttribute(STATE_YEAR)).intValue();
+				int stateMonth = ((Integer)sstate.getAttribute(STATE_MONTH)).intValue();
+				int stateDay = ((Integer)sstate.getAttribute(STATE_DAY)).intValue();
+
+				calObj.setDay(stateYear, stateMonth, stateDay);
+				dateObj1.setTodayDate(calObj.getMonthInteger(),calObj.getDayOfMonth(),calObj.getYear());
+			}
 
 			String scheduleTo = (String)sstate.getAttribute(STATE_SCHEDULE_TO);
 			if (scheduleTo != null && scheduleTo.length() != 0)