LupusNobilis/sogo
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #97 from inverse-inc/feature/saveFilterEventsTasks

Browse source 
Reworked saving Events filter and added Tasks filter
This commit is contained in:
Francis Lachapelle 2015-08-06 17:49:03 -04:00
parent 063e973ef3 42eb9e51b4
commit 7f2ef967b4
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
UI/Scheduler/UIxCalListingActions.m
View file

@ -652,10 +652,11 @@ static NSArray *tasksFields = nil;
return [self _responseWithData: data]; return [self _responseWithData: data];
} }
- (void) saveEventFilterValue - (void) saveFilterValue: (NSString *) submodule
{ {
NSString *filter; NSString *filter;
SOGoUserSettings *us; SOGoUserSettings *us;
NSMutableDictionary *calendarSettings;
filter = [[context request] formValueForKey: @"filterpopup"]; filter = [[context request] formValueForKey: @"filterpopup"];
if ([filter length] if ([filter length]
@ -663,7 +664,15 @@ static NSArray *tasksFields = nil;
&& ![filter isEqualToString: @"view_future"]) && ![filter isEqualToString: @"view_future"])
{ {
us = [[context activeUser] userSettings]; us = [[context activeUser] userSettings];
[us setObject: filter forKey: @"CalendarDefaultFilter"]; calendarSettings = [us objectForKey: @"Calendar"];
// Must create if it doesn't exist
if (!calendarSettings)
{
calendarSettings = [NSMutableDictionary dictionary];
[us setObject: calendarSettings forKey: @"Calendar"];
}
//[us setObject: filter forKey: submodule];
[calendarSettings setObject: filter forKey: submodule];
[us synchronize]; [us synchronize];
} }
} }
@ -743,7 +752,7 @@ static NSArray *tasksFields = nil;
NSString *sort, *ascending; NSString *sort, *ascending;
[self _setupContext]; [self _setupContext];
[self saveEventFilterValue]; [self saveFilterValue: @"EventsFilterState"];
[self saveSortValue: @"EventsSortingState"]; [self saveSortValue: @"EventsSortingState"];
newEvents = [NSMutableArray array]; newEvents = [NSMutableArray array];
@ -1436,6 +1445,7 @@ _computeBlocksPosition (NSArray *blocks)
filteredTasks = [NSMutableArray array]; filteredTasks = [NSMutableArray array];
[self _setupContext]; [self _setupContext];
[self saveFilterValue: @"TasksFilterState"];
[self saveSortValue: @"TasksSortingState"]; [self saveSortValue: @"TasksSortingState"];
startSecs = (unsigned int) [startDate timeIntervalSince1970]; startSecs = (unsigned int) [startDate timeIntervalSince1970];