Fixed Mantis102: Apache2 deb issue and Mantis90: Remember if we show completed tasks

Monotone-Parent: f49ae822ce1ffd032a2522ecf1d1c4fd425678b1
Monotone-Revision: 27c3e7606471d513ab1014e7afa4c56071c0245e

Monotone-Author: crobert@inverse.ca
Monotone-Date: 2009-08-17T20:07:54
Monotone-Branch: ca.inverse.sogo

UI/Scheduler/UIxCalListingActions.m

@@ -27,6 +27,7 @@
 #import <Foundation/NSString.h>
 #import <Foundation/NSTimeZone.h>
 #import <Foundation/NSValue.h>
+#import <Foundation/NSUserDefaults.h>
 
 #import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
@@ -967,9 +968,10 @@ _computeBlocksPosition (NSArray *blocks)
 
 - (WOResponse *) tasksListAction
 {
+  NSUserDefaults *ud;
   NSEnumerator *tasks;
   NSMutableArray *filteredTasks, *filteredTask;
-  BOOL showCompleted;
+  BOOL showCompleted, setUserDefault;
   NSArray *task;
   int statusCode;
   unsigned int endDateStamp;
@@ -982,6 +984,15 @@ _computeBlocksPosition (NSArray *blocks)
   tasks = [[self _fetchFields: tasksFields
 		 forComponentOfType: @"vtodo"] objectEnumerator];
   showCompleted = [[request formValueForKey: @"show-completed"] intValue];
+  setUserDefault = [[request formValueForKey: @"setud"] intValue];
+  if (setUserDefault)
+    {
+      ud = [[context activeUser] userDefaults];
+      [ud setObject: [NSNumber numberWithInt: showCompleted]
+             forKey: @"ShowCompletedTasks"];
+      [ud synchronize];
+    }
+  
 
   while (task = [tasks nextObject])
     {

UI/WebServerResources/SchedulerUI.js

@@ -7,7 +7,7 @@ var listFilter = 'view_today';
 var listOfSelection = null;
 var selectedCalendarCell;
 
-var showCompletedTasks = 0;
+var showCompletedTasks;;
 
 var currentDay = '';
 
@@ -1354,9 +1354,12 @@ function refreshEvents() {
                           + "&filterpopup=" + listFilter);
 }
 
-function refreshTasks() {
+function refreshTasks(setUserDefault) {
+    var url = "taskslist?show-completed=" + showCompletedTasks;
+    if (setUserDefault == 1)
+      url += "&setud=1";
     refreshAlarms();
-    return _loadTasksHref("taskslist?show-completed=" + showCompletedTasks);
+    return _loadTasksHref(url);
 }
 
 function refreshEventsAndDisplay() {
@@ -1560,7 +1563,7 @@ function changeMonthCalendarDisplayOfSelectedDay(node) {
 function onShowCompletedTasks(event) {
     showCompletedTasks = (this.checked ? 1 : 0);
 
-    return refreshTasks();
+    return refreshTasks(1);
 }
 
 function updateTaskStatus(event) {
@@ -2039,6 +2042,8 @@ function configureLists() {
 
     var input = $("showHideCompletedTasks");
     input.observe("click", onShowCompletedTasks);
+    if (showCompletedTasks)
+      input.checked = true;
 
     list = $("eventsList");
     list.multiselect = true;
@@ -2123,6 +2128,7 @@ function drawNowLine () {
 function initCalendars() {
     sorting["attribute"] = "start";
     sorting["ascending"] = true;
+    showCompletedTasks = UserDefaults['ShowCompletedTasks'];
   
     if (!$(document.body).hasClassName("popup")) {
         var node = $("filterpopup");