amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-06-23 10:54:17 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: 093eb3ebcf238b8c813759fda17e22addd7cc0b0

Browse Source 
Monotone-Revision: 34dbce3026b164b07c558711781fcfb5cde0fcff

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2008-11-03T14:17:57
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2008-11-03 14:17:57 +00:00
parent 73b30201b5
commit 07225fe588
3 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/Appointments/iCalRepeatableEntityObject+SOGo.m
+10
View File
@@ -21,8 +21,10 @@
*/
#import <Foundation/NSArray.h>
#import <Foundation/NSCalendarDate.h>
#import <Foundation/NSDictionary.h>
#import <Foundation/NSString.h>
#import <Foundation/NSTimeZone.h>
#import <NGCards/iCalRecurrenceRule.h>
#import <NGCards/iCalRecurrenceCalculator.h>
@@ -107,11 +109,19 @@
NSArray *ranges;
NGCalendarDateRange *checkRange;
NSCalendarDate *endDate;
NSTimeZone *tz;
BOOL doesOccur;
signed daylightOffset;
doesOccur = [self isRecurrent];
if (doesOccur)
{
tz = [occurenceDate timeZone];
if ([tz isDaylightSavingTimeForDate: occurenceDate] != [tz isDaylightSavingTimeForDate: [self startDate]]) {
daylightOffset = [tz secondsFromGMTForDate: occurenceDate] - [tz secondsFromGMTForDate: [self startDate]];
occurenceDate = [occurenceDate dateByAddingYears: 0 months: 0 days: 0 hours: 0 minutes: 0 seconds: daylightOffset];
}
endDate = [occurenceDate addTimeInterval: [self occurenceInterval]];
checkRange = [NGCalendarDateRange calendarDateRangeWithStartDate: occurenceDate
endDate: endDate];
UI/Scheduler/UIxAppointmentEditor.m
+3
View File
@@ -43,6 +43,7 @@
#import <SoObjects/SOGo/SOGoContentObject.h>
#import <SoObjects/Appointments/SOGoAppointmentFolder.h>
#import <SoObjects/Appointments/SOGoAppointmentObject.h>
#import <SoObjects/Appointments/SOGoAppointmentOccurence.h>
#import <SoObjects/Appointments/SOGoComponentOccurence.h>
@@ -270,6 +271,8 @@
{
sm = [SoSecurityManager sharedSecurityManager];
if ([co isKindOfClass: [SOGoAppointmentOccurence class]])
co = [co container];
thisFolder = [co container];
if (componentCalendar != thisFolder)
if (![sm validatePermission: SoPerm_DeleteObjects
UI/WebServerResources/SchedulerUI.js
+4 -1
View File
@@ -313,7 +313,10 @@ function _editRecurrenceDialog(eventDiv, method) {
function onViewEvent(event) {
if (event.detail == 2) return;
var url = ApplicationBaseURL + this.calendar + "/" + this.cname + "/view";
var url = ApplicationBaseURL + this.calendar + "/" + this.cname;
if (typeof this.recurrenceTime != "undefined")
url += "/occurence" + this.recurrenceTime;
url += "/view";
if (document.viewEventAjaxRequest) {
document.viewEventAjaxRequest.aborted = true;
document.viewEventAjaxRequest.abort();