From 1b99e86910ff80c0d3987c34f9288e93632591e3 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Wed, 18 Apr 2012 19:17:59 +0000 Subject: [PATCH] Monotone-Parent: 2d2d3a51a60fe527ccb060a620cf04792ccfb293 Monotone-Revision: 9af7f3b786a8f22f5ddae91d7aba838abbd724d5 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2012-04-18T19:17:59 --- ChangeLog | 3 +++ UI/Scheduler/UIxCalMainActions.m | 17 ----------------- UI/Scheduler/product.plist | 5 ----- 3 files changed, 3 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index 965f29b80..9a0d173fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2012-04-18 Wolfgang Sourdeau + * UI/Scheduler/UIxCalMainActions.m + (-reloadWebCalendarsAndRedirectAction): removed obsolete method. + * SoObjects/Appointments/SOGoAppointmentFolders.m (-newWebCalendarWithName:atURL:): perform sanity checks on the url parameter. diff --git a/UI/Scheduler/UIxCalMainActions.m b/UI/Scheduler/UIxCalMainActions.m index 0312ac579..216db791c 100644 --- a/UI/Scheduler/UIxCalMainActions.m +++ b/UI/Scheduler/UIxCalMainActions.m @@ -107,21 +107,4 @@ 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 11cabb44e..266f4cd4f 100644 --- a/UI/Scheduler/product.plist +++ b/UI/Scheduler/product.plist @@ -50,11 +50,6 @@ actionClass = "UIxCalMainActions"; actionName = "reloadWebCalendars"; }; - reloadWebCalendarsAndRedirect = { - protectedBy = "View"; - actionClass = "UIxCalMainActions"; - actionName = "reloadWebCalendarsAndRedirect"; - }; saveDragHandleState = { protectedBy = "View"; pageName = "UIxCalMainView";