Added saving of Calendar Sort to jsonSettings

This commit is contained in:
Luc Charland
2015-08-06 12:16:17 -04:00
parent 2a132b4e8f
commit 31b959a7dc
+26 -2
View File
@@ -652,7 +652,7 @@ static NSArray *tasksFields = nil;
return [self _responseWithData: data];
}
- (void) checkFilterValue
- (void) saveFilterValue
{
NSString *filter;
SOGoUserSettings *us;
@@ -668,6 +668,29 @@ static NSArray *tasksFields = nil;
}
}
- (void) saveSortValue
{
NSString *sort, *ascending;
SOGoUserSettings *us;
NSMutableDictionary *calendarSettings;
sort = [[context request] formValueForKey: @"sort"];
ascending = [[context request] formValueForKey: @"asc"];
if ([sort length])
{
us = [[context activeUser] userSettings];
calendarSettings = [us objectForKey: @"Calendar"];
// Must create if it doesn't exist
if (!calendarSettings)
{
calendarSettings = [NSMutableDictionary dictionary];
[us setObject: calendarSettings forKey: @"Calendar"];
}
[calendarSettings setObject: [NSArray arrayWithObjects: [sort lowercaseString], [NSString stringWithFormat: @"%d", (ascending?1:0)], nil] forKey: @"SortingState"];
[us synchronize];
}
}
/**
* @api {get} /so/:username/Calendar/eventslist List events
* @apiVersion 1.0.0
@@ -720,7 +743,8 @@ static NSArray *tasksFields = nil;
NSString *sort, *ascending;
[self _setupContext];
[self checkFilterValue];
[self saveFilterValue];
[self saveSortValue];
newEvents = [NSMutableArray array];
events = [[self _fetchFields: eventsFields