amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-09-01 03:37:22 +00:00
Code Issues Projects Releases Wiki Activity

See ChangeLog.

Browse Source 
Monotone-Parent: d4394b4b92fdfda720d67698c9fbadc75787ad18
Monotone-Revision: e8c7d8a4465a1b9357c1d9f201dec2b93c5f3507

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-02-11T07:08:02
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2012-02-11 07:08:02 +00:00
parent e8abd08d31
commit 7815b3403c
15 changed files with 124 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/Contacts/UIxContactFoldersView.m
+7 -3
View File
@@ -29,6 +29,7 @@
#import <NGObjWeb/SoObject.h>
#import <NGObjWeb/SoSecurityManager.h>
#import <NGObjWeb/WOContext.h>
#import <NGObjWeb/WOContext+SoObjects.h>
#import <NGObjWeb/WORequest.h>
#import <NGObjWeb/WOResponse.h>
@@ -122,7 +123,8 @@ Class SOGoContactSourceFolderK, SOGoGCSFolderK;
contactInfos = [folder lookupContactsWithFilter: nil
onCriteria: nil
sortBy: @"c_cn"
ordering: NSOrderedAscending];
ordering: NSOrderedAscending
inDomain: nil];
else
contactInfos = nil;
@@ -159,7 +161,7 @@ Class SOGoContactSourceFolderK, SOGoGCSFolderK;
{
id <WOActionResults> result;
SOGoFolder <SOGoContactFolder> *folder;
NSString *searchText, *mail;
NSString *searchText, *mail, *domain;
NSDictionary *data;
NSArray *folders, *contacts, *descriptors, *sortedContacts;
NSMutableArray *sortedFolders;
@@ -174,6 +176,7 @@ Class SOGoContactSourceFolderK, SOGoGCSFolderK;
// NSLog(@"Search all contacts: %@", searchText);
excludeGroups = [[self queryParameterForKey: @"excludeGroups"] boolValue];
excludeLists = [[self queryParameterForKey: @"excludeLists"] boolValue];
domain = [[context activeUser] domain];
folders = nil;
NS_DURING
folders = [[self clientObject] subFolders];
@@ -205,7 +208,8 @@ Class SOGoContactSourceFolderK, SOGoGCSFolderK;
contacts = [folder lookupContactsWithFilter: searchText
onCriteria: @"name_or_address"
sortBy: @"c_cn"
ordering: NSOrderedAscending];
ordering: NSOrderedAscending
inDomain: domain];
for (j = 0; j < [contacts count]; j++)
{
contact = [contacts objectAtIndex: j];
UI/Contacts/UIxContactsListActions.m
+8 -4
View File
@@ -27,6 +27,7 @@
#import <NGObjWeb/NSException+HTTP.h>
#import <NGObjWeb/WOContext.h>
#import <NGObjWeb/WOContext+SoObjects.h>
#import <NGObjWeb/WOResponse.h>
#import <NGObjWeb/WORequest.h>
#import <NGExtensions/NSString+misc.h>
@@ -110,7 +111,8 @@
contactInfos = [folder lookupContactsWithFilter: valueText
onCriteria: searchText
sortBy: [self sortKey]
ordering: ordering];
ordering: ordering
inDomain: [[context activeUser] domain]];
[contactInfos retain];
}
@@ -138,7 +140,7 @@
{
id <WOActionResults> result;
id <SOGoContactFolder> folder;
NSString *searchText, *mail;
NSString *searchText, *mail, *domain;
NSDictionary *contact, *data;
NSArray *contacts, *descriptors, *sortedContacts;
NSMutableDictionary *uniqueContacts;
@@ -158,12 +160,14 @@
else
[localException raise];
NS_ENDHANDLER
domain = [[context activeUser] domain];
uniqueContacts = [NSMutableDictionary dictionary];
contacts = [folder lookupContactsWithFilter: searchText
onCriteria: @"name_or_address"
sortBy: @"c_cn"
ordering: NSOrderedAscending];
ordering: NSOrderedAscending
inDomain: domain];
for (i = 0; i < [contacts count]; i++)
{
contact = [contacts objectAtIndex: i];
UI/MailerUI/UIxMailEditor.m
+2 -1
View File
@@ -417,7 +417,8 @@ static NSArray *infoKeys = nil;
contactInfos = [folder lookupContactsWithFilter: nil
onCriteria: nil
sortBy: @"c_cn"
ordering: NSOrderedAscending];
ordering: NSOrderedAscending
inDomain: nil];
return contactInfos;
}