improved handling of multivalue formkeys

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

diff --git a/SOGo/UI/MailerUI/ChangeLog b/SOGo/UI/MailerUI/ChangeLog
index 6c372729b412e759d376bba108ae1f040e32ef66..2720a7f353c267fa399a8e7e03d73ac65236e2b1 100644 (file)
--- a/SOGo/UI/MailerUI/ChangeLog
+++ b/SOGo/UI/MailerUI/ChangeLog
@@ -1,5 +1,8 @@
 2005-07-18  Helge Hess  <helge.hess@opengroupware.org>
 
+       * UIxMailSortableTableHeader.m: improved handling of multivalue form
+         keys (v0.9.149)
+
        * UIxMailAccountView.m: added method to check whether folder-create
          button should be visible on the account folder view (checks INBOX for
          the ACL, does check the alt-namespace default),

diff --git a/SOGo/UI/MailerUI/UIxMailSortableTableHeader.m b/SOGo/UI/MailerUI/UIxMailSortableTableHeader.m
index 7dc1a346909ceecaccfbe30cca075bdf54f2da36..bc407a2f7c1223546ae332c242c1e436457183e3 100644 (file)
--- a/SOGo/UI/MailerUI/UIxMailSortableTableHeader.m
+++ b/SOGo/UI/MailerUI/UIxMailSortableTableHeader.m
@@ -83,6 +83,18 @@
   return self->queryDictionary;
 }
 
+- (id)singleQueryValueForKey:(NSString *)_key {
+  id so;
+  
+  so = [self->queryDictionary objectForKey:@"sort"];
+  if (![so isNotNull]) return nil;
+  
+  if (![so isKindOfClass:[NSArray class]])
+    return so;
+  
+  return ([so count] > 0) ? [so objectAtIndex:0] : nil;
+}
+
 - (void)setIsDefault:(BOOL)_isDefault {
   self->isDefault = _isDefault;
 }
@@ -90,11 +102,12 @@
   return self->isDefault;
 }
 
+/* derived accessors */
+
 - (BOOL)isSelected {
   NSString *so;
   
-  so = [self->queryDictionary objectForKey:@"sort"];
-  if (![so isNotNull])
+  if ((so = [self singleQueryValueForKey:@"sort"]) == nil)
     return self->isDefault;
   
   return [so isEqualToString:self->sortKey];
@@ -102,10 +115,10 @@
 
 - (BOOL)isSortedDescending {
   NSString *desc;
-  
-  desc = [self->queryDictionary objectForKey:@"desc"];
-  if (desc == nil)
+
+  if ((desc = [self singleQueryValueForKey:@"desc"]) == nil)
     return NO;
+  
   return [desc boolValue];
 }
 

diff --git a/SOGo/UI/MailerUI/Version b/SOGo/UI/MailerUI/Version
index 9d77989c57077d41f65779134f69e23ef2790ef5..0f952de8eb16e270110907511ee7b81a41b71dcc 100644 (file)
--- a/SOGo/UI/MailerUI/Version
+++ b/SOGo/UI/MailerUI/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=148
+SUBMINOR_VERSION:=149
 
 # v0.9.140 requires SoObjects/Mailer v0.9.100
 # v0.9.134 requires libSOGo          v0.9.41