From 6767b1073726c4315bbd0061d2fa64f19fb35c10 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Sat, 31 Jan 2015 11:54:31 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 92630: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud) 92573: Merged DEV to 5.0.N (5.0.1) 92438: SHA-15 : SPP: Recurrence: null value is displayed in details of event which occurs monthly/yearly on day/weekday/weekend day - Added display message day/weekday/weekend day for monthly/yearly Recurrence git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94896 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../service/cmr/calendar/CalendarRecurrenceHelper.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/source/java/org/alfresco/service/cmr/calendar/CalendarRecurrenceHelper.java b/source/java/org/alfresco/service/cmr/calendar/CalendarRecurrenceHelper.java index 1ab05cd35c..54765ba498 100644 --- a/source/java/org/alfresco/service/cmr/calendar/CalendarRecurrenceHelper.java +++ b/source/java/org/alfresco/service/cmr/calendar/CalendarRecurrenceHelper.java @@ -57,6 +57,10 @@ public class CalendarRecurrenceHelper public static final Map DAY_NAMES_TO_CALENDAR_DAYS = Collections.unmodifiableMap(d2cd); + public final static String DAY = "day"; + public final static String WEEKDAYS = "weekday"; + public final static String WEEKENDS = "weekend day"; + /** * Returns a lookup from recurrence rule days of the week, to * the proper days of the week in the specified locale