# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1296344420 -3600
# Node ID 4283df4412ca7d9b24438176df9d0ca788a12522
# Parent  920253974e4c7bafe93fe1b67e5531bba1fab4df
Fixed start and end request parameter overriding to work with unnamed calendars.
Fixed the calendar, list and table view links to explicitly use month values.

diff -r 920253974e4c -r 4283df4412ca macros/EventAggregator.py
--- a/macros/EventAggregator.py	Sun Jan 30 00:01:00 2011 +0100
+++ b/macros/EventAggregator.py	Sun Jan 30 00:40:20 2011 +0100
@@ -293,15 +293,12 @@
 
         output = []
 
-        calendar_link = self.getNavigationLink(
-            self.calendar_start, self.calendar_end, "calendar"
-            )
-        list_link = self.getNavigationLink(
-            self.calendar_start, self.calendar_end, "list"
-            )
-        table_link = self.getNavigationLink(
-            self.calendar_start, self.calendar_end, "table"
-            )
+        start = self.calendar_start.as_month()
+        end = self.calendar_end.as_month()
+
+        calendar_link = self.getNavigationLink(start, end, "calendar")
+        list_link = self.getNavigationLink(start, end, "list")
+        table_link = self.getNavigationLink(start, end, "table")
 
         # Write the controls.
 
@@ -1137,9 +1134,8 @@
     original_calendar_start = calendar_start = get_date(raw_calendar_start)
     original_calendar_end = calendar_end = get_date(raw_calendar_end)
 
-    if calendar_name is not None:
-        calendar_start = get_form_date(request, calendar_name, "start") or calendar_start
-        calendar_end = get_form_date(request, calendar_name, "end") or calendar_end
+    calendar_start = get_form_date(request, calendar_name, "start") or calendar_start
+    calendar_end = get_form_date(request, calendar_name, "end") or calendar_end
 
     # Get the events according to the resolution of the calendar.