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 f43cfb155605f2f0e3567034c3129d7685dffabf..f51ea6262c50b90f70a1d105f8b42bcc6b8618a0 100644 (file)
--- 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 6d10b9eb54db10cdd413282a638b311e9a966d4c..d8e10aee3c22e6cc8624753ff2749d63dcf91506 100644 (file)
--- 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 dd43a42afb40afd532d60c38c152a607846933c2..5ccb7b3ce22215ff595a0107441ed090cacb273a 100644 (file)
--- 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 790131407a1d4ee03b5d745c83552adaaa5d8863..1b50054bc551f0cf3c69f4352429e577cdb26491 100644 (file)
--- 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 5dd82a9cf5764f95f29e16c1990cb00b4d9b0f5e..2dc8d25722ba4511fd0def63d89e6e7d12c6ff63 100644 (file)
--- 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 daa1c0f7c76c7fbf95e6745934d58ed95631cc8f..a37094defc22f7954fa9ad0973021b9fc9271d46 100644 (file)
--- 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)"