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

Improve JSON responses from server

Browse Source
This commit is contained in:
Francis Lachapelle
2015-12-09 09:44:33 -05:00
parent 38e5588c67
commit 5e978940f9
3 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/Scheduler/UIxAppointmentActions.m
+9 -7
View File
@@ -60,7 +60,7 @@
SoSecurityManager *sm;
iCalEvent *event;
NSCalendarDate *start, *newStart, *end, *newEnd;
NSDictionary *params;
NSDictionary *params, *jsonResponse;
NSTimeInterval newDuration;
SOGoUserDefaults *ud;
NSNumber *daysDelta, *startDelta, *durationDelta;
@@ -138,24 +138,26 @@
inContext: context])
ex = [co moveToFolder: targetCalendar];
}
}
if (ex)
{
NSDictionary *jsonResponse;
jsonResponse = [NSDictionary dictionaryWithObjectsAndKeys:
[ex reason], @"message",
nil];
response = [self responseWithStatus: 403
andString: [jsonResponse jsonRepresentation]];
andJSONRepresentation: jsonResponse];
}
else
response = [self responseWith204];
}
else
response = (WOResponse *) [NSException exceptionWithHTTPStatus: 400
reason: @"missing 'days', 'start' and/or 'duration' parameters"];
{
jsonResponse = [NSDictionary dictionaryWithObjectsAndKeys:
@"missing 'days', 'start' and/or 'duration' parameters", @"message",
nil];
response = [self responseWithStatus: 400
andJSONRepresentation: jsonResponse];
}
return response;
}