1.1 --- a/macros/EventAggregator.py Sun Jan 30 00:01:00 2011 +0100
1.2 +++ b/macros/EventAggregator.py Sun Jan 30 00:40:20 2011 +0100
1.3 @@ -293,15 +293,12 @@
1.4
1.5 output = []
1.6
1.7 - calendar_link = self.getNavigationLink(
1.8 - self.calendar_start, self.calendar_end, "calendar"
1.9 - )
1.10 - list_link = self.getNavigationLink(
1.11 - self.calendar_start, self.calendar_end, "list"
1.12 - )
1.13 - table_link = self.getNavigationLink(
1.14 - self.calendar_start, self.calendar_end, "table"
1.15 - )
1.16 + start = self.calendar_start.as_month()
1.17 + end = self.calendar_end.as_month()
1.18 +
1.19 + calendar_link = self.getNavigationLink(start, end, "calendar")
1.20 + list_link = self.getNavigationLink(start, end, "list")
1.21 + table_link = self.getNavigationLink(start, end, "table")
1.22
1.23 # Write the controls.
1.24
1.25 @@ -1137,9 +1134,8 @@
1.26 original_calendar_start = calendar_start = get_date(raw_calendar_start)
1.27 original_calendar_end = calendar_end = get_date(raw_calendar_end)
1.28
1.29 - if calendar_name is not None:
1.30 - calendar_start = get_form_date(request, calendar_name, "start") or calendar_start
1.31 - calendar_end = get_form_date(request, calendar_name, "end") or calendar_end
1.32 + calendar_start = get_form_date(request, calendar_name, "start") or calendar_start
1.33 + calendar_end = get_form_date(request, calendar_name, "end") or calendar_end
1.34
1.35 # Get the events according to the resolution of the calendar.
1.36