SAK-30872 Solve calendar subscription message (sakaiproject#2462)

vijaya1618 · May 6, 2016 · 7403941 · 7403941
1 parent 61cc6e3
commit 7403941
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/calendar/calendar-impl/impl/src/java/org/sakaiproject/calendar/impl/BaseCalendarService.java b/calendar/calendar-impl/impl/src/java/org/sakaiproject/calendar/impl/BaseCalendarService.java
@@ -6380,7 +6380,7 @@ protected int generateICal(net.fortuna.ical4j.model.Calendar ical, List<String>
 	 */
 	public TimeRange getICalTimeRange()
 	{
-		int toMonthsInput = m_serverConfigurationService.getInt("calendar.export.next.months",6);
+		int toMonthsInput = m_serverConfigurationService.getInt("calendar.export.next.months",12);
 		int fromMonthsInput = m_serverConfigurationService.getInt("calendar.export.previous.months",6);
 
 		java.util.Calendar calTo = java.util.Calendar.getInstance();

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
@@ -4039,8 +4039,8 @@ public String buildIcalExportPanelContext(VelocityPortlet portlet, Context conte
 
 		context.put("serverName", ServerConfigurationService.getServerName());
 
-		String icalInfoArr[] = {String.valueOf(ServerConfigurationService.getInt("calendar.export.previous.months",6)),
-			String.valueOf(ServerConfigurationService.getInt("calendar.export.next.months",6))};
+		String icalInfoArr[] = {String.valueOf(ServerConfigurationService.getInt("calendar.export.next.months",12)),
+			String.valueOf(ServerConfigurationService.getInt("calendar.export.previous.months",6))};
 		String icalInfoStr = rb.getFormattedMessage("ical.info",icalInfoArr);
 		context.put("icalInfoStr",icalInfoStr);
 
@@ -4070,8 +4070,8 @@ protected void buildOpaqueUrlCleanContext(VelocityPortlet portlet, Context conte
 		context.put("isMyWorkspace", isOnWorkspaceTab());
 		context.put("form-generate", BUTTON + "doOpaqueUrlGenerate");
 		context.put("form-cancel", BUTTON + "doCancel");
-		String icalInfoArr[] = {String.valueOf(ServerConfigurationService.getInt("calendar.export.previous.months",6)),
-			String.valueOf(ServerConfigurationService.getInt("calendar.export.next.months",6))};
+		String icalInfoArr[] = {String.valueOf(ServerConfigurationService.getInt("calendar.export.next.months",12)),
+			String.valueOf(ServerConfigurationService.getInt("calendar.export.previous.months",6))};
 		String icalInfoStr = rb.getFormattedMessage("ical.info",icalInfoArr);
 		context.put("icalInfoStr",icalInfoStr);
 	}
@@ -4086,8 +4086,8 @@ protected void buildOpaqueUrlExistingContext(VelocityPortlet portlet, Context co
 		String opaqueUrl = ServerConfigurationService.getAccessUrl()
 			+ CalendarService.calendarOpaqueUrlReference(calendarRef);
 
-		String icalInfoArr[] = {String.valueOf(ServerConfigurationService.getInt("calendar.export.previous.months",6)),
-			String.valueOf(ServerConfigurationService.getInt("calendar.export.next.months",6))};
+		String icalInfoArr[] = {String.valueOf(ServerConfigurationService.getInt("calendar.export.next.months",12)),
+			String.valueOf(ServerConfigurationService.getInt("calendar.export.previous.months",6))};
 		String icalInfoStr = rb.getFormattedMessage("ical.info",icalInfoArr);
 		context.put("icalInfoStr",icalInfoStr);
 

diff --git a/calendar/calendar-tool/tool/src/webapp/vm/calendar/chef_calendar_icalexport.vm b/calendar/calendar-tool/tool/src/webapp/vm/calendar/chef_calendar_icalexport.vm
@@ -25,7 +25,7 @@
 	</h3>
 
 	<p class="messageInformation">
-		$icalInfoStr $tlang.getString("ical.info")<br/>
+		$icalInfoStr $tlang.getString("ical.info.public")<br/>
 	</p>
 
    <p/>
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,7 +25,7 @@ @@
     	</h3>
     	<p class="messageInformation">
-    		$icalInfoStr $tlang.getString("ical.info")<br/>
+    		$icalInfoStr $tlang.getString("ical.info.public")<br/>
     	</p>
        <p/>
@@ Expand Down @@