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

Monotone-Parent: a641a4defe2d11d4baa914640535e45ef48f0425

Browse Source 
Monotone-Revision: 0de048fc2845b8e712e21700f4604fa0cd9eeea4

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-05-28T16:52:17
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2010-05-28 16:52:17 +00:00
parent df904d06ab
commit eb8125f468
3 changed files with 59 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+9
View File
@@ -1,3 +1,12 @@
2010-05-28 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/WebServerResources/UIxComponentEditor.js:
(findDeleteAddress): new function that returns the properly
formatter full email of the delegate attendee.
(findAttendeeWithFieldValue): new function that wanders through
the list of attendees and returns the one that has the field
passed as parameter equal to the value passed as parameter.
2010-05-27 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/MailerUI/WOContext+UIxMailer.m
UI/Templates/SchedulerUI/UIxComponentEditor.wox
+1 -14
View File
@@ -212,24 +212,14 @@
string="itemReplyText"
var:selection="reply" /></span>
</label>
<var:if condition="ownerAsAttendee.delegatedTo" const:negate="YES">
<label id="delegateEditor" style="display: none;">
<span class="content">
<input name="delegatedTo" id="delegatedTo" type="text" var:value="ownerAsAttendee.delegatedTo" var:uid="delegatedTo" />
<input name="delegatedTo" id="delegatedTo" type="text" const:value=""/>
<!--
<br />
<input type="checkbox" name="delegateReceiveUpdates" /> <var:string label:value="Keep sending me updates" /> -->
</span>
</label>
</var:if><var:if condition="ownerAsAttendee.delegatedTo">
<label id="delegateEditor">
<span class="content">
<input name="delegatedTo" id="delegatedTo" type="text" var:value="ownerAsAttendee.delegatedTo.rfc822Email" var:uid="ownerAsAttendee.delegatedTo.rfc822Email" />
<br />
<input type="checkbox" name="delegateReceiveUpdates" /> <var:string label:value="Keep sending me updates" />
</span>
</label>
</var:if>
<!--TODO: I'm not sure how to send this
<label><var:string label:value="Reminder:" />
<span class="content"><var:popup list="reminderList" item="item"
@@ -256,9 +246,6 @@
><div const:class="statusIcon"><!-- space --></div
><a var:href="attendee.email" var:email="attendee.email.rfc822Email"
><var:string value="attendeeForDisplay" /></a
><var:if condition="attendee.delegatedFrom"
> (<var:string label:value="delegated from" />
<var:string value="attendee.delegatedFrom.rfc822Email" />)</var:if
></div
></var:if>
</var:foreach>
UI/WebServerResources/UIxComponentEditor.js
+49 -3
View File
@@ -135,6 +135,42 @@ function initializePrivacyMenu() {
}
}
function findAttendeeWithFieldValue(field, fieldValue) {
var foundAttendee = null;
var attendeesKeys = attendees.keys();
for (var i = 0; !foundAttendee && i < attendeesKeys.length; i++) {
var attendee = attendees.get(attendeesKeys[i]);
if (attendee[field] == fieldValue) {
foundAttendee = attendee;
}
}
return foundAttendee;
}
function findDelegateAddress() {
var delegateAddress = null;
var ownerAttendee = findAttendeeWithFieldValue("uid", ownerLogin);
if (ownerAttendee && ownerAttendee["delegated-to"]) {
var delegateAttendee
= findAttendeeWithFieldValue("email",
ownerAttendee["delegated-to"]);
if (delegateAttendee) {
if (delegateAttendee["name"]) {
delegateAddress = (delegateAttendee["name"]
+ " <" + delegateAttendee["email"] + ">");
}
else {
delegateAddress = delegateAttendee["email"];
}
}
}
return delegateAddress;
}
function onComponentEditorLoad(event) {
initializeDocumentHref();
initializePrivacyMenu();
@@ -152,16 +188,26 @@ function onComponentEditorLoad(event) {
onMenuSetClassification.bindAsEventListener(menuItems[i]),
false);
}
tmp = $("replyList");
if (tmp) {
tmp.observe("change", onReplyChange);
var isDelegated = (tmp.value == 4);
tmp = $("delegatedTo");
tmp.addInterface(SOGoAutoCompletionInterface);
tmp.uidField = "c_mail";
tmp.excludeGroups = true;
tmp.animationParent=$("delegateEditor");
}
var delegateEditor = $("delegateEditor");
tmp.animationParent = delegateEditor;
if (isDelegated) {
var delegateAddress = findDelegateAddress();
if (delegateAddress) {
tmp.value = delegateAddress;
}
delegateEditor.show();
}
}
tmp = $("repeatHref");
if (tmp)
tmp.observe("click", onPopupRecurrenceWindow);