From: helge <helge@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Wed, 13 Jul 2005 09:53:01 +0000 (+0000)
Subject: fixed for GCS changes
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=131672c0a4c15e2448d0ea9b8716fc2ffec436a6;p=scalable-opengroupware.org

fixed for GCS changes


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

diff --git a/SOGo/SoObjects/SOGo/ChangeLog b/SOGo/SoObjects/SOGo/ChangeLog
index f43cfb15..f51ea626 100644
--- a/SOGo/SoObjects/SOGo/ChangeLog
+++ b/SOGo/SoObjects/SOGo/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-13  Helge Hess  <helge.hess@opengroupware.org>
+
+	* SOGoFolder.m: changed to use plain column names (v0.9.50)
+
 2005-07-12  Marcus Mueller  <znek@mulle-kybernetik.com>
 
 	* SOGoUserFolder.m: forbid access (403) to SOGoGroupFolders if access
diff --git a/SOGo/SoObjects/SOGo/SOGoFolder.m b/SOGo/SoObjects/SOGo/SOGoFolder.m
index 6d10b9eb..d8e10aee 100644
--- a/SOGo/SoObjects/SOGo/SOGoFolder.m
+++ b/SOGo/SoObjects/SOGo/SOGoFolder.m
@@ -76,7 +76,7 @@
   }
   if ([records isKindOfClass:[NSException class]])
     return records;
-  return [records valueForKey:@"cName"];
+  return [records valueForKey:@"c_name"];
 }
 - (NSDictionary *)fetchContentStringsAndNamesOfAllObjects {
   NSDictionary *files;
diff --git a/SOGo/SoObjects/SOGo/Version b/SOGo/SoObjects/SOGo/Version
index dd43a42a..5ccb7b3c 100644
--- a/SOGo/SoObjects/SOGo/Version
+++ b/SOGo/SoObjects/SOGo/Version
@@ -1,6 +1,7 @@
 # version file
 
-SUBMINOR_VERSION:=49
+SUBMINOR_VERSION:=50
 
+# v0.9.50 requires libGDLContentStore v4.5.30
 # v0.9.34 requires libGDLContentStore v4.5.26
 # v0.9.26 requires libOGoContentStore v0.9.13
diff --git a/SOGo/UI/Templates/ChangeLog b/SOGo/UI/Templates/ChangeLog
index 79013140..1b50054b 100644
--- a/SOGo/UI/Templates/ChangeLog
+++ b/SOGo/UI/Templates/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-13  Helge Hess  <helge.hess@opengroupware.org>
+
+	* ContactsUI/UIxContactsListView.wox, UIxMailContactList.wox: changed
+	  to use c_name instead of cName (as required by new GDLContentStore)
+
 2005-07-12  Marcus Mueller  <znek@mulle-kybernetik.com>
 
 	* UIxAppointmentEditor.wox: moved the 'checkForConflicts' button near
diff --git a/SOGo/UI/Templates/ContactsUI/UIxContactsListView.wox b/SOGo/UI/Templates/ContactsUI/UIxContactsListView.wox
index 5dd82a9c..2dc8d257 100644
--- a/SOGo/UI/Templates/ContactsUI/UIxContactsListView.wox
+++ b/SOGo/UI/Templates/ContactsUI/UIxContactsListView.wox
@@ -127,7 +127,7 @@
                   <var:foreach list="contactInfos" item="contact">
                     <tr>
                       <td>
-                        <a var:href="contact.cName"
+                        <a var:href="contact.c_name"
                            ><var:string value="contact.sn" /></a>
                       </td>
                       <td><var:string value="contact.givenname"       /></td>
diff --git a/SOGo/UI/Templates/UIxMailContactList.wox b/SOGo/UI/Templates/UIxMailContactList.wox
index daa1c0f7..a37094de 100644
--- a/SOGo/UI/Templates/UIxMailContactList.wox
+++ b/SOGo/UI/Templates/UIxMailContactList.wox
@@ -106,7 +106,7 @@ input.cl_inlinefield {
         <!-- actual table contents -->
         <var:foreach list="contactInfos" item="contact">
           <tr class="tableview" 
-              var:id="contact.cName"
+              var:id="contact.c_name"
               onclick="openContact(this, this.id)"
               onmouseover="cl_highlight(this)"
               onmouseout="cl_lowlight(this)"