amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-08-12 02:13:18 +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
SoObjects/Appointments/SOGoAppointmentObject.m
+4 -2
View File
@@ -652,7 +652,7 @@
else
{
iCalCalendar *calendar;
NSDictionary *values;
NSDictionary *values, *info;
NSString *reason;
iCalEvent *event;
@@ -669,8 +669,10 @@
reason = [values keysWithFormat: [self labelForKey: @"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\". The conflicting event is \"%{EventTitle}\", and starts on %{StartDate}."]];
info = [NSDictionary dictionaryWithObject: reason forKey: @"reject"];
return [NSException exceptionWithHTTPStatus: 403
reason: reason];
reason: [info jsonRepresentation]];
}
}
//