From a9850c50dae3d02ed6bd29d37ed4194260ee6c13 Mon Sep 17 00:00:00 2001 From: Vishwas Babu A J Date: Sun, 14 Dec 2014 23:36:10 -0800 Subject: [PATCH] removing merge conflicts introduced in https://github.com/openMF/mifosx/pull/1174 --- .../portfolio/calendar/domain/Calendar.java | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/calendar/domain/Calendar.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/calendar/domain/Calendar.java index 139d35a20..faa47e238 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/calendar/domain/Calendar.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/calendar/domain/Calendar.java @@ -329,20 +329,6 @@ public class Calendar extends AbstractAuditableCustom { final String newRecurrence = Calendar.constructRecurrence(command, this); if (!StringUtils.isBlank(this.recurrence) && !newRecurrence.equalsIgnoreCase(this.recurrence)) { - // FIXME: AA - Is this restriction required only for collection type - // meetings or for all?. - // Do not allow to change meeting frequency - - if (!CalendarUtils.isFrequencySame(this.recurrence, newRecurrence)) { - final String defaultUserMessage = "Update of meeting frequency is not supported"; - throw new CalendarParameterUpdateNotSupportedException("meeting.frequency", defaultUserMessage); - } - - // Do not allow to change meeting interval - if (!CalendarUtils.isIntervalSame(this.recurrence, newRecurrence)) { - final String defaultUserMessage = "Update of meeting interval is not supported"; - throw new CalendarParameterUpdateNotSupportedException("meeting.interval", defaultUserMessage); - } actualChanges.put("recurrence", newRecurrence); this.recurrence = StringUtils.defaultIfEmpty(newRecurrence, null); }