Handle attendee conflicts in the Web interface

See @d7b010
This commit is contained in:
Francis Lachapelle
2016-02-15 15:58:58 -05:00
parent f2ffb52318
commit d56d9f8b08
9 changed files with 176 additions and 21 deletions
+6 -3
View File
@@ -467,6 +467,7 @@
SOGoAppointmentObject *co;
SoSecurityManager *sm;
WORequest *request;
id error;
unsigned int httpStatus;
BOOL forceSave;
@@ -490,7 +491,7 @@
else
{
[self setAttributes: params];
forceSave = NO;
forceSave = [[params objectForKey: @"ignoreConflicts"] boolValue];
if ([event hasRecurrenceRules])
[self _adjustRecurrentRules];
@@ -546,9 +547,11 @@
if ([ex respondsToSelector: @selector(httpStatus)])
httpStatus = [ex httpStatus];
error = [[ex reason] objectFromJSONString];
if (error == nil)
error = [ex reason];
jsonResponse = [NSDictionary dictionaryWithObjectsAndKeys:
[ex reason], @"message",
nil];
error, @"message", nil];
}
else
{