From 64dd572b4b8f3c42926acc687bae34cb8b6ecca8 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Mon, 28 Nov 2011 16:37:04 +0000 Subject: [PATCH] Monotone-Parent: 533cf8ab1e070968af4fbbe2ddbd0d66b8fd2b7b Monotone-Revision: 242b11744a01859b09e976093dc5b526d501fd87 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2011-11-28T16:37:04 --- ChangeLog | 8 ++++++++ SoObjects/Appointments/SOGoAppointmentFolder.m | 8 +++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 71ce5c4fe..ab78d4d65 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2011-11-28 Wolfgang Sourdeau + + * SoObjects/Appointments/SOGoAppointmentFolder.m + (-bareFetchFields:from:to:title:component:additionalFilters:): + we must not attempt to instantiate an EOQualifier with a "nil" + format, otherwise it causes an exception. Settings the qualifier + as nil instead. + 2011-11-24 Francis Lachapelle * UI/WebServerResources/ContactsUI.js (resetCategoriesMenu): the diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m index 37d24370a..9b250a2ba 100644 --- a/SoObjects/Appointments/SOGoAppointmentFolder.m +++ b/SoObjects/Appointments/SOGoAppointmentFolder.m @@ -544,12 +544,14 @@ static NSNumber *sharedYes = nil; filterSqlString]; /* sql is empty when we fetch everything (all parameters are nil) */ if ([sql length] > 0) - sql = [sql substringFromIndex: 4]; + { + sql = [sql substringFromIndex: 4]; + qualifier = [EOQualifier qualifierWithQualifierFormat: sql]; + } else - sql = nil; + qualifier = nil; /* fetch non-recurrent apts first */ - qualifier = [EOQualifier qualifierWithQualifierFormat: sql]; records = [folder fetchFields: fields matchingQualifier: qualifier]; }