mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-09-03 20:55:08 +00:00
fix(UI): use legitimate sorting value
This commit is contained in:
@@ -115,12 +115,18 @@
|
||||
{
|
||||
NSMutableDictionary *contactSettings;
|
||||
NSString *ascending, *sort;
|
||||
NSArray *sortValues;
|
||||
SOGoUserSettings *us;
|
||||
|
||||
sort = [[self requestData] objectForKey: @"sort"];
|
||||
ascending = [[self requestData] objectForKey: @"asc"];
|
||||
|
||||
if ([sort length])
|
||||
//Check value of sorting
|
||||
sortValues = [NSArray arrayWithObjects: @"c_cn", @"c_sn",
|
||||
@"c_givenname", @"c_mail", @"c_screenname", @"c_o", @"c_telephonenumber", nil];
|
||||
|
||||
|
||||
if ([sort length] && [sortValues containsObject:sort])
|
||||
{
|
||||
sort = [self sortKey];
|
||||
us = [[context activeUser] userSettings];
|
||||
|
||||
@@ -408,6 +408,7 @@
|
||||
NSString *sort, *module;
|
||||
NSMutableDictionary *moduleSettings;
|
||||
NSDictionary *urlParams, *sortingAttributes;
|
||||
NSArray *sortValues;
|
||||
SOGoUser *activeUser;
|
||||
SOGoUserSettings *us;
|
||||
BOOL asc, dry;
|
||||
@@ -424,7 +425,11 @@
|
||||
us = [activeUser userSettings];
|
||||
moduleSettings = [us objectForKey: module];
|
||||
|
||||
if ([sort length])
|
||||
//Check sort value
|
||||
sortValues = [NSArray arrayWithObjects: @"subject", @"from",
|
||||
@"date", @"size", @"arrival", nil];
|
||||
|
||||
if ([sort length] && [sortValues containsObject:sort])
|
||||
{
|
||||
if ([sort isEqualToString: [self defaultSortKey]] && !asc)
|
||||
{
|
||||
|
||||
@@ -786,12 +786,19 @@ static NSArray *tasksFields = nil;
|
||||
- (void) saveSortValue: (NSString *) submodule
|
||||
{
|
||||
NSString *sort, *ascending;
|
||||
NSArray *sortValues;
|
||||
SOGoUserSettings *us;
|
||||
NSMutableDictionary *calendarSettings;
|
||||
|
||||
sort = [[context request] formValueForKey: @"sort"];
|
||||
ascending = [[context request] formValueForKey: @"asc"];
|
||||
if ([sort length])
|
||||
|
||||
//Check value of sorting
|
||||
sortValues = [NSArray arrayWithObjects: @"title", @"location",
|
||||
@"calendarName", @"start", @"priority", @"category", @"status", @"end", nil];
|
||||
|
||||
|
||||
if ([sort length] && [sortValues containsObject:sort])
|
||||
{
|
||||
us = [[context activeUser] userSettings];
|
||||
calendarSettings = [us objectForKey: @"Calendar"];
|
||||
|
||||
@@ -254,6 +254,7 @@
|
||||
{
|
||||
WORequest *request;
|
||||
NSDictionary *params;
|
||||
NSArray *listValues;
|
||||
NSString *selectedList;
|
||||
|
||||
[self _setupContext];
|
||||
@@ -261,6 +262,14 @@
|
||||
params = [[request contentAsString] objectFromJSONString];
|
||||
|
||||
selectedList = [params objectForKey: @"list"];
|
||||
|
||||
//Check value
|
||||
listValues = [NSArray arrayWithObjects: @"eventsListView", @"tasksListView", nil];
|
||||
if([selectedList length] && ![listValues containsObject:selectedList])
|
||||
{
|
||||
selectedList = @"eventsListView";
|
||||
}
|
||||
|
||||
[moduleSettings setObject: selectedList
|
||||
forKey: @"SelectedList"];
|
||||
[us synchronize];
|
||||
|
||||
Reference in New Issue
Block a user