Reworked saving Events filter and added Tasks filter

Alinto · Aug 6, 2015 · 42eb9e5 · 42eb9e5
1 parent 8690cee
commit 42eb9e5
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/UI/Scheduler/UIxCalListingActions.m b/UI/Scheduler/UIxCalListingActions.m
@@ -652,18 +652,27 @@ - (WOResponse *) alarmsListAction
   return [self _responseWithData: data];
 }
 
-- (void) saveEventFilterValue
+- (void) saveFilterValue: (NSString *) submodule
 {
   NSString *filter;
   SOGoUserSettings *us;
+  NSMutableDictionary *calendarSettings;
 
   filter = [[context request] formValueForKey: @"filterpopup"];
   if ([filter length]
       && ![filter isEqualToString: @"view_all"]
       && ![filter isEqualToString: @"view_future"])
   {
     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];
   }
 }
@@ -743,7 +752,7 @@ - (WOResponse *) eventsListAction
   NSString *sort, *ascending;
 
   [self _setupContext];
-  [self saveEventFilterValue];
+  [self saveFilterValue: @"EventsFilterState"];
   [self saveSortValue: @"EventsSortingState"];
 
   newEvents = [NSMutableArray array];
@@ -1436,6 +1445,7 @@ - (WOResponse *) tasksListAction
   filteredTasks = [NSMutableArray array];
 
   [self _setupContext];
+  [self saveFilterValue: @"TasksFilterState"];
   [self saveSortValue: @"TasksSortingState"];
 
   startSecs = (unsigned int) [startDate timeIntervalSince1970];