From 7ffe6ee26a71f020e02031add4f3b2de808cabf9 Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Thu, 23 Dec 2010 15:50:35 +0000
Subject: [PATCH] See ChangeLog

Monotone-Parent: dcee22693d3a16ba20dcd9824bd2cfd39c0cf369
Monotone-Revision: f5359c59c0bb008203154487db17e1ecdd274c0d

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2010-12-23T15:50:35
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                        |  5 +++++
 UI/MainUI/SOGoUserHomePage.m     |  2 +-
 UI/Scheduler/UIxCalMainActions.m | 17 +++++++++++++++++
 UI/Scheduler/product.plist       |  5 +++++
 4 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 6aa8d0357..deffc70bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-23  Ludovic Marcotte  <lmarcotte@inverse.ca>
+
+        * Added the /SOGo/so/<user>/Calendar/reloadWebCalendarsAndRedirect
+	action which is particularly useful for WebAuth users
+
 2010-12-17  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* OpenChange/MAPIStore*Context.m: added handling of a few more
diff --git a/UI/MainUI/SOGoUserHomePage.m b/UI/MainUI/SOGoUserHomePage.m
index 27f83d2b1..1c2950a5e 100644
--- a/UI/MainUI/SOGoUserHomePage.m
+++ b/UI/MainUI/SOGoUserHomePage.m
@@ -1,6 +1,6 @@
 /* SOGoUserHomePage.m - this file is part of SOGo
  *
- * Copyright (C) 2007-2009 Inverse inc.
+ * Copyright (C) 2007-2010 Inverse inc.
  *
  * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
  *
diff --git a/UI/Scheduler/UIxCalMainActions.m b/UI/Scheduler/UIxCalMainActions.m
index 216db791c..0312ac579 100644
--- a/UI/Scheduler/UIxCalMainActions.m
+++ b/UI/Scheduler/UIxCalMainActions.m
@@ -107,4 +107,21 @@
   return [self responseWith204];
 }
 
+//
+// The method below is different than the -reloadWebCalendarsAction as it
+// won't force the reload of all calendars and automatically redirect the
+// user to the /SOGo/so page upon completion.
+//
+// This is particularly useful for WebAuth users and they won't have a
+// precise "entry point" in SOGo - so calendars reload upon login
+// isn't possible for them.
+//
+- (WOResponse *) reloadWebCalendarsAndRedirectAction
+{
+  [[self clientObject] reloadWebCalendars: NO];
+
+  return [self redirectToLocation: @"/SOGo/so"];
+}
+
+
 @end
diff --git a/UI/Scheduler/product.plist b/UI/Scheduler/product.plist
index 266f4cd4f..11cabb44e 100644
--- a/UI/Scheduler/product.plist
+++ b/UI/Scheduler/product.plist
@@ -50,6 +50,11 @@
           actionClass = "UIxCalMainActions";
           actionName  = "reloadWebCalendars";
         };
+        reloadWebCalendarsAndRedirect = {
+          protectedBy = "View";
+          actionClass = "UIxCalMainActions";
+          actionName  = "reloadWebCalendarsAndRedirect";
+        };
         saveDragHandleState = {
           protectedBy = "View";
           pageName    = "UIxCalMainView";