mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-05-18 01:45:25 +00:00
merge of '540f090a7d557ec7343d1c63082b35d288d03630'
and '7aef600466ee268d07b4d4516d7457e184d2e0be' Monotone-Parent: 540f090a7d557ec7343d1c63082b35d288d03630 Monotone-Parent: 7aef600466ee268d07b4d4516d7457e184d2e0be Monotone-Revision: 2f97890bbf7aff0d55eb80775c6c96e7bf5a6343 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2009-10-27T18:45:06 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
@@ -1,3 +1,16 @@
|
||||
2009-10-27 Ludovic Marcotte <lmarcotte@inverse.ca>
|
||||
|
||||
* SoObjects/SOGo/SOGoGCSFolder.m (create)
|
||||
We send the advisory to the owner of the newly
|
||||
created collection, not the currently logged on
|
||||
user (which might be different). The sender will
|
||||
nevertheless be the currently logged on user, as
|
||||
it's this particular user that triggered the
|
||||
creation of the collection.
|
||||
* Documentation/SOGo Installation Guide.odt
|
||||
Updated to set WOUseRelativeURLs to YES instead
|
||||
of NO by default.
|
||||
|
||||
2009-10-26 Francis Lachapelle <flachapelle@inverse.ca>
|
||||
|
||||
* UI/WebServerResources/ContactsUI.js
|
||||
|
||||
Binary file not shown.
@@ -392,7 +392,7 @@ static NSArray *childRecordFields = nil;
|
||||
|
||||
if (sendFolderAdvisories)
|
||||
{
|
||||
user = [context activeUser];
|
||||
user = [SOGoUser userWithLogin: [self ownerInContext: context]];
|
||||
pageName = [NSString stringWithFormat: @"SOGoFolder%@%@Advisory",
|
||||
[user language], template];
|
||||
|
||||
|
||||
@@ -60,14 +60,27 @@
|
||||
{
|
||||
return [list cardReferences];
|
||||
}
|
||||
- (NSString *) itemText
|
||||
|
||||
- (NSString *) itemHref
|
||||
{
|
||||
NSString *rc;
|
||||
return [NSString stringWithFormat: @"mailto:%@",
|
||||
[item email]];
|
||||
}
|
||||
|
||||
rc = [NSString stringWithFormat: @"%@ <%@>",
|
||||
[item fn], [item email]];
|
||||
- (NSString *) itemOnclick
|
||||
{
|
||||
return [NSString stringWithFormat: @"return openMailTo('%@ <%@>');",
|
||||
[item fn], [item email]];
|
||||
}
|
||||
|
||||
return rc;
|
||||
- (NSString *) itemName
|
||||
{
|
||||
return [item fn];
|
||||
}
|
||||
|
||||
- (NSString *) itemEmail
|
||||
{
|
||||
return [item email];
|
||||
}
|
||||
|
||||
- (void) checkListReferences
|
||||
|
||||
@@ -19,7 +19,10 @@
|
||||
</var:if>
|
||||
<ul class="listComponents">
|
||||
<var:foreach list="components" item="item">
|
||||
<li><var:string value="itemText"/></li>
|
||||
<li><var:string var:value="itemName"/>
|
||||
<a var:href="itemHref" var:onclick="itemOnclick">
|
||||
<<var:string var:value="itemEmail"/>></a>
|
||||
</li>
|
||||
</var:foreach>
|
||||
</ul>
|
||||
</var:component>
|
||||
|
||||
Reference in New Issue
Block a user