Adding Attendees from AB works again

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@751 d1b88da0-ebda-0310-925b-ed51d893ca5b

diff --git a/SOGo/SoObjects/Contacts/SOGoContactFolder.m b/SOGo/SoObjects/Contacts/SOGoContactFolder.m
index 6bd07b897292c765f0ab3eb21807db4e065b31cd..23bb95d4b677cac1057c7a38c092adbe6e4d717f 100644 (file)
--- a/SOGo/SoObjects/Contacts/SOGoContactFolder.m
+++ b/SOGo/SoObjects/Contacts/SOGoContactFolder.m
@@ -82,7 +82,7 @@
   NSArray     *fields, *records;
 
   fields = [NSArray arrayWithObjects:
-                     @"c_name",
+                     @"c_name", @"cn",
                      @"sn", @"givenname", @"l", 
                      @"mail", @"telephonenumber",
                    nil];

diff --git a/SOGo/UI/Contacts/UIxContactsSelectionView.m b/SOGo/UI/Contacts/UIxContactsSelectionView.m
index ee926fd222d7ebbdfcb64b2bef6aadfb1ac0119b..2e960de9a47581eff5a11d0936ec5e924bf4c5de 100644 (file)
--- a/SOGo/UI/Contacts/UIxContactsSelectionView.m
+++ b/SOGo/UI/Contacts/UIxContactsSelectionView.m
@@ -66,20 +66,7 @@ static SOGoJSStringFormatter *jsFormatter = nil;
 }
 
 - (NSString *)_getCN {
-  NSString *sn, *gn;
-
-  sn = [self->contact valueForKey:@"sn"];
-  gn = [self->contact valueForKey:@"givenname"];
-
-  if((!sn || [sn length] == 0) &&
-     (!gn || [gn length] == 0)) {
-    return @"";
-  } else if(!sn || [sn length] == 0) {
-    return gn;
-  } else if(!gn || [gn length] == 0) {
-    return sn;
-  }
-  return [NSString stringWithFormat:@"%@ %@", sn, gn];
+  return [self->contact valueForKey:@"cn"];
 }
 
 - (NSString *)getCN {
@@ -101,15 +88,28 @@ static SOGoJSStringFormatter *jsFormatter = nil;
 
 - (NSString *)jsOnClickCode {
   /* callback parameters: (type, cn, dn, email, uid, sn) */
+
+
+
+  /* changed to :  type, email, uid, sn, cn, dn */
   static NSString *jsCode = \
-    @"javascript:opener.window.%@('', '%@', '', '%@', '%@', '%@');";
+    @"javascript:opener.window.%@('', '%@', '%@', '%@', '%@', '');";
 
   return [NSString stringWithFormat:jsCode,
-    [self callback],
-    [self getCN],
-    [self getMail],
-    [self getUID],
-    [self getSN]];
+                  [self callback],
+                  [self getMail],
+                  [self getUID],
+                  [self getSN],
+                  [self getCN]];
+
+
+
+  //  return [NSString stringWithFormat:jsCode,
+  //    [self callback],
+  //    [self getCN],
+  //    [self getMail],
+  //    [self getUID],
+  //    [self getSN]];
 }
 
 @end /* UIxContactsInlineListView */