From 31b959a7dc7096bb9f50d2116ac261da3b084de8 Mon Sep 17 00:00:00 2001
From: Luc Charland <lcharland@inverse.ca>
Date: Thu, 6 Aug 2015 12:16:17 -0400
Subject: [PATCH] Added saving of Calendar Sort to jsonSettings

---
 UI/Scheduler/UIxCalListingActions.m | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/UI/Scheduler/UIxCalListingActions.m b/UI/Scheduler/UIxCalListingActions.m
index 3b588c6de..5ea147a3f 100644
--- a/UI/Scheduler/UIxCalListingActions.m
+++ b/UI/Scheduler/UIxCalListingActions.m
@@ -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