merge of '6ccb3c8e1a50f88fbb322c6e2d3c04e736f48475'

and 'f0935fff2414656359bd160c4d90eb3f0e9d8598'

Monotone-Parent: 6ccb3c8e1a50f88fbb322c6e2d3c04e736f48475
Monotone-Parent: f0935fff2414656359bd160c4d90eb3f0e9d8598
Monotone-Revision: 2ec2bb218c1f6876ffaba4bb7f29f652a1080446

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2009-07-19T14:00:29
Monotone-Branch: ca.inverse.sogo

ChangeLog

@@ -10,6 +10,12 @@
 	* UI/Scheduler/UIxCalFilterPanel.m (-selectedFilter): return
 	"view_today" as default filter.
 
+2009-07-17  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/Contacts/UIxContactFoldersView.m ([UIxContactFoldersView
+	-mailerContactsAction]): restored method lost with
+	UIxContactsListViewContainer.
+
 2009-07-17  Cyril Robert <crobert@inverse.ca>
 
 	* SoObjects/Appointments/SOGoAppointmentFolder.m

UI/Contacts/UIxContactFoldersView.h

@@ -29,6 +29,7 @@
 @interface UIxContactFoldersView : UIxComponent
 {
   NSUserDefaults *ud;
+  NSString *selectorComponentClass;
   NSMutableDictionary *moduleSettings;
   id currentFolder;
 }

UI/Contacts/UIxContactFoldersView.m

@@ -74,9 +74,35 @@
   [ud setObject: moduleSettings forKey: module];
 }
 
+- (id <WOActionResults>) mailerContactsAction
+{
+  selectorComponentClass = @"UIxContactsMailerSelection";
+
+  return self;
+}
+
+- (NSString *) selectorComponentClass
+{
+  return selectorComponentClass;
+}
+
+- (WOElement *) selectorComponent
+{
+  WOElement *newComponent;
+
+  newComponent = [self pageWithName: selectorComponentClass];
+
+  return newComponent;
+}
+
+- (BOOL) hasContactSelectionButtons
+{
+  return (selectorComponentClass != nil);
+}
+
 - (void) _fillResults: (NSMutableDictionary *) results
-inFolder: (id <SOGoContactFolder>) folder
-withSearchOn: (NSString *) contact
+             inFolder: (id <SOGoContactFolder>) folder
+	 withSearchOn: (NSString *) contact
 {
   NSEnumerator *folderResults;
   NSDictionary *currentContact;

UI/Contacts/UIxContactsListView.h

@@ -32,7 +32,6 @@
 @interface UIxContactsListView : UIxComponent
 {
   NSDictionary *currentContact;
-  NSString *selectorComponentClass;
   NSArray *contactInfos;
 }
 

UI/Contacts/UIxContactsListView.m

@@ -34,11 +34,8 @@
 - (id) init
 {
   if ((self = [super init]))
-    {
-      selectorComponentClass = nil;
-      contactInfos = nil;
-    }
-
+    contactInfos = nil;
+  
   return self;
 }
 
@@ -60,18 +57,6 @@
   return currentContact;
 }
 
-- (id <WOActionResults>) mailerContactsAction
-{
-  selectorComponentClass = @"UIxContactsMailerSelection";
-
-  return self;
-}
-
-- (NSString *) selectorComponentClass
-{
-  return selectorComponentClass;
-}
-
 - (NSString *) defaultSortKey
 {
   return @"c_cn";

UI/Contacts/product.plist

@@ -21,7 +21,7 @@
            mailer-contacts = {
               protectedBy = "View";
               pageName    = "UIxContactFoldersView";
-              actionName  = "selectForMailer";
+              actionName  = "mailerContacts";
            };
            contactSearch = {
               protectedBy = "<public>";