merge of '15319a5f3d5074d8502634ab24003b28d070d85e'

and '98e797e237e41e316f67dab068ddf038cdcc0b9a'

Monotone-Parent: 15319a5f3d5074d8502634ab24003b28d070d85e
Monotone-Parent: 98e797e237e41e316f67dab068ddf038cdcc0b9a
Monotone-Revision: dab4ee4d9a35331ab917eaf590b5318395be4a43

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2010-01-22T20:14:33
Monotone-Branch: ca.inverse.sogo

ChangeLog

@@ -1,3 +1,11 @@
+2010-01-22  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/Contacts/UIxListEditor.m (-references): avoid printing the
+	email address between brackets if not defined.
+
+	* UI/Contacts/UIxListView.m (-itemHasEmail): new method that
+	returns YES if the current list item has an email address.
+
 2010-01-22  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* Tools/SOGoToolRestore.m (+initialize): we need to invoke

UI/Contacts/UIxListEditor.m

@@ -79,8 +79,12 @@
     {
       ref = [[list cardReferences] objectAtIndex: i];
       row = [NSMutableDictionary dictionary];
-      [row setObject: [NSString stringWithFormat: @"%@ <%@>", [ref fn], [ref email]]
-              forKey: @"name"];
+      if ([[ref email] length] > 0)
+	[row setObject: [NSString stringWithFormat: @"%@ <%@>", [ref fn], [ref email]]
+		forKey: @"name"];
+      else
+	[row setObject: [ref fn]
+		forKey: @"name"];
       [row setObject: [ref reference] forKey: @"id"];
       [rc addObject: row];
     }

UI/Contacts/UIxListView.m

@@ -61,6 +61,11 @@
   return [list cardReferences];
 }
 
+- (BOOL) itemHasEmail
+{
+  return [[item email] length] > 0;
+}
+
 - (NSString *) itemHref
 {
   return [NSString stringWithFormat: @"mailto:%@",

UI/Templates/ContactsUI/UIxListView.wox

@@ -20,8 +20,8 @@
     <ul class="listComponents">
       <var:foreach list="components" item="item">
         <li><var:string var:value="itemName"/> 
-          <a var:href="itemHref" var:onclick="itemOnclick">
-            &lt;<var:string var:value="itemEmail"/>&gt;</a>
+          <var:if condition="itemHasEmail"><a var:href="itemHref" var:onclick="itemOnclick">
+            &lt;<var:string var:value="itemEmail"/>&gt;</a></var:if>
         </li>
       </var:foreach>
     </ul>