amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-07-05 08:34:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into fix-some-warnings

Browse Source 
Conflicts:
	UI/Scheduler/UIxAppointmentActions.m
This commit is contained in:
Patrice Levesque
2016-02-16 14:32:50 -05:00
parent a5cc2bb5d5 4c01417690
commit 9cb1b899b0
16 changed files with 382 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/Scheduler/UIxAppointmentActions.m
+6 -2
View File
@@ -64,6 +64,7 @@
SOGoAppointmentFolder *targetCalendar, *sourceCalendar;
SOGoAppointmentFolders *folders;
BOOL forceSave;
id error;
rq = [context request];
params = [[rq contentAsString] objectFromJSONString];
@@ -72,7 +73,7 @@
startDelta = [params objectForKey: @"start"];
durationDelta = [params objectForKey: @"duration"];
destionationCalendar = [params objectForKey: @"destination"];
forceSave = NO;
forceSave = [[params objectForKey: @"ignoreConflicts"] boolValue];
if (daysDelta || startDelta || durationDelta)
{
@@ -146,8 +147,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",
error, @"message",
nil];
response = [self responseWithStatus: httpStatus