CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 28 Packages Projects Releases Wiki Activity

removing merge conflicts introduced in https://github.com/openMF/mifosx/pull/1174

Browse Source
This commit is contained in:
Vishwas Babu A J
2014-12-14 23:36:10 -08:00
parent 9e6f8a8e40
commit a9850c50da
1 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-provider/src/main/java/org/mifosplatform/portfolio/calendar/domain/Calendar.java
-14
View File
@@ -329,20 +329,6 @@ public class Calendar extends AbstractAuditableCustom<AppUser, Long> {
final String newRecurrence = Calendar.constructRecurrence(command, this); final String newRecurrence = Calendar.constructRecurrence(command, this);
if (!StringUtils.isBlank(this.recurrence) && !newRecurrence.equalsIgnoreCase(this.recurrence)) { 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); actualChanges.put("recurrence", newRecurrence);
this.recurrence = StringUtils.defaultIfEmpty(newRecurrence, null); this.recurrence = StringUtils.defaultIfEmpty(newRecurrence, null);
} }