Monotone-Parent: 4c1856e056f5a2d88369a3bd6c3054a5b479f549
Monotone-Revision: 0a40fd3ca846353b46531655128873c9575677fa Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2006-10-03T16:12:32 Monotone-Branch: ca.inverse.sogomaint-2.0.2
parent
c1eb1e5bbd
commit
3f12e72af0
|
@ -1,5 +1,11 @@
|
|||
2006-10-03 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||
|
||||
* UI/Contacts/UIxContactFoldersView.m ([UIxContactFoldersView
|
||||
-defaultAction]): keep the url parameters when redirecting.
|
||||
([UIxContactFoldersView -selectForSchedulerAction])
|
||||
([UIxContactFoldersView -selectForMailerAction]): new action
|
||||
methods for the /scheduler-contacts and /mailer-contacts invocations.
|
||||
|
||||
* SoObjects/SOGo/SOGoObject.m: compose the action url using the
|
||||
newly available NSString+URL category.
|
||||
|
||||
|
|
|
@ -34,10 +34,14 @@
|
|||
- (id) defaultAction
|
||||
{
|
||||
SOGoContactFolders *folders;
|
||||
NSString *url;
|
||||
|
||||
folders = [self clientObject];
|
||||
url = [NSString stringWithFormat: @"%@/view%@",
|
||||
[folders defaultSourceName],
|
||||
[[self queryParameters] asURLParameters]];
|
||||
|
||||
return [self redirectToLocation: [folders defaultSourceName]];
|
||||
return [self redirectToLocation: url];
|
||||
}
|
||||
|
||||
- (id) newAction
|
||||
|
@ -53,7 +57,7 @@
|
|||
return [self redirectToLocation: url];
|
||||
}
|
||||
|
||||
- (id) selectAction
|
||||
- (id) _selectActionForApplication: (NSString *) actionName
|
||||
{
|
||||
SOGoContactFolders *folders;
|
||||
NSString *url, *selectorId;
|
||||
|
@ -61,11 +65,21 @@
|
|||
folders = [self clientObject];
|
||||
selectorId = [self queryParameterForKey: @"selectorId"];
|
||||
|
||||
url = [NSString stringWithFormat: @"%@/select?selectorId=%@",
|
||||
url = [NSString stringWithFormat: @"%@/%@?selectorId=%@",
|
||||
[folders defaultSourceName],
|
||||
selectorId];
|
||||
actionName, selectorId];
|
||||
|
||||
return [self redirectToLocation: url];
|
||||
}
|
||||
|
||||
- (id) selectForSchedulerAction
|
||||
{
|
||||
return [self _selectActionForApplication: @"scheduler-contacts"];
|
||||
}
|
||||
|
||||
- (id) selectForMailerAction
|
||||
{
|
||||
return [self _selectActionForApplication: @"mailer-contacts"];
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
Loading…
Reference in New Issue