amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-03-13 02:41:24 +00:00
Code Issues Projects Releases Wiki Activity

See ChangeLog (fix for bug #234)

Browse Source 
Monotone-Parent: c6211d892652356a678ac26ac4f287499fbe91ea
Monotone-Revision: 2c0e8a6a410ecb7bc3984b724b271bf6bbdb8947

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2009-12-22T21:07:06
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2009-12-22 21:07:06 +00:00
parent 843af28d1a
commit 14201aa76d
3 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -1,3 +1,8 @@
2009-12-22 Francis Lachapelle <flachapelle@inverse.ca>
* UI/Scheduler/UIxAppointmentEditor.m (-viewAction): added
calendar name in returned dictionary.
2009-12-21 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/SOGoUserFolder.m (-fetchContentObjectNames):

9
UI/Scheduler/UIxAppointmentEditor.m
View File

@@ -455,6 +455,14 @@
[eventDate setTimeZone: timeZone];
co = [self clientObject];
if (!componentCalendar)
{
componentCalendar = [co container];
if ([componentCalendar isKindOfClass: [SOGoCalendarComponent class]])
componentCalendar = [componentCalendar container];
[componentCalendar retain];
}
resetAlarm = [[[context request] formValueForKey: @"resetAlarm"] boolValue];
if (resetAlarm && [event hasAlarms] && ![event hasRecurrenceRules])
{
@@ -483,6 +491,7 @@
}
}
data = [NSDictionary dictionaryWithObjectsAndKeys:
[componentCalendar displayName], @"calendar",
[event tag], @"component",
[dateFormatter formattedDate: eventDate], @"startDate",
[dateFormatter formattedTime: eventDate], @"startTime",

5
UI/Templates/SchedulerUI/UIxCalMainView.wox
View File

@@ -92,8 +92,9 @@
<div id="eventDialog" style="display: none;" class="dialog">
<div>
<h1><!-- space --></h1>
<p id="startTime"><span class="label"><var:string label:value="Start:" /></span> <span><!-- space --></span></p>
<p id="location"><span class="label"><var:string label:value="Location:" /></span> <span><!-- space --></span></p>
<p><span class="label"><var:string label:value="Calendar:" /></span> <span><!-- space --></span></p>
<p><span class="label"><var:string label:value="Start:" /></span> <span><!-- space --></span></p>
<p><span class="label"><var:string label:value="Location:" /></span> <span><!-- space --></span></p>
<p id="description"><!-- space --></p>
</div>
</div>