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

Load alarm from UIxComponentEditor

Browse Source 
The alarm attributes are now loaded from UIxComponentEditor and not
iCalEntityObject so we can determine if the component's owner is part of
the alarm's attendees.
This commit is contained in:
Francis Lachapelle
2015-06-22 09:20:35 -04:00
parent d89f02ff53
commit 8402152a59
4 changed files with 56 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/Scheduler/UIxAppointmentEditor.m
+3 -2
View File
@@ -545,8 +545,8 @@
* @apiExample {curl} Example usage:
* curl -i http://localhost/SOGo/so/sogo1/Calendar/personal/71B6-54904400-1-7C308500.ics/view
*
* @apiParam {Number} [resetAlarm] Mark alarm as triggered if set to 1
* @apiParam {Number} [snoozeAlarm] Snooze the alarm for this number of minutes
* @apiParam {Number} [resetAlarm] Mark alarm as triggered if set to 1
* @apiParam {Number} [snoozeAlarm] Snooze the alarm for this number of minutes
*
* @apiSuccess (Success 200) {String} id Event ID
* @apiSuccess (Success 200) {String} pid Calendar ID (event's folder)
@@ -682,6 +682,7 @@
[NSNumber numberWithBool: [self isReadOnly]], @"isReadOnly",
[dateFormatter formattedDate: eventStartDate], @"localizedStartDate",
[dateFormatter formattedDate: eventEndDate], @"localizedEndDate",
[self loadAlarm], @"alarm",
nil];
if (!isAllDay)