When viewing read-only event, organizer is shown only if event has attendees

Monotone-Parent: 1857b430e01dba18873b059ee5977d9ca10bea8e
Monotone-Revision: 09a0f45d386d7951e7a9222e26d26b67281bf847

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2009-07-30T01:07:17
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Francis Lachapelle 2009-07-30 01:07:17 +00:00
parent f42d095e46
commit 3e357eb6e9
4 changed files with 16 additions and 3 deletions

View File

@ -1,5 +1,9 @@
2009-07-29 Francis Lachapelle <flachapelle@inverse.ca>
* UI/Scheduler/UIxComponentEditor.m ([UIxComponentEditor
-hasAttendees]): new method used to show organizer only if the event
has attenddes (read-only view).
* UI/Scheduler/UIxTaskEditor.m ([UIxTaskEditor
-taskStartDateTimeText]): new method to return a localized
description of the start date and time.

View File

@ -140,6 +140,8 @@
- (void) setAttach: (NSString *) _attachUrl;
- (NSString *) attach;
- (BOOL) hasAttendees;
- (void) setAttendeesNames: (NSString *) newAttendeesNames;
- (NSString *) attendeesNames;

View File

@ -744,6 +744,11 @@ iRANGE(2);
// return [item keysWithFormat: @"%{fullName} <%{email}>"];
//}
- (BOOL) hasAttendees
{
return ([[component attendees] count] > 0);
}
- (void) setAttendeesNames: (NSString *) newAttendeesNames
{
ASSIGN (attendeesNames, newAttendeesNames);
@ -1536,7 +1541,7 @@ RANGE(2);
owner = [componentCalendar ownerInContext: context];
login = [[context activeUser] login];
isOwner = [owner isEqualToString: login];
hasAttendees = ([[component attendees] count] > 0);
hasAttendees = [self hasAttendees];
organizerEmail = [[component organizer] email];
hasOrganizer = ([organizerEmail length] > 0);

View File

@ -203,9 +203,11 @@
<label id="documentLabel" style="display: none;"><var:string label:value="Document:" />
<span class="content"><a href="#" id="documentHref"><!-- space --></a></span>
</label>
<label id="organizerLabel"><var:string label:value="Organizer:"/>
<var:if condition="hasAttendees">
<label id="organizerLabel"><var:string label:value="Organizer:"/>
<span class="content"><var:string value="organizerName"/></span>
</label>
</label>
</var:if>
<var:if condition="userIsAttendee">
<label><var:string label:value="Reply:" />
<span class="content"><var:popup list="replyList" item="item"