1.1 --- a/actions/EventAggregatorSummary.py Tue Feb 15 00:14:40 2011 +0100
1.2 +++ b/actions/EventAggregatorSummary.py Wed Feb 16 00:52:49 2011 +0100
1.3 @@ -248,11 +248,12 @@
1.4 format = form.get("format", ["iCalendar"])[0]
1.5 descriptions = form.get("descriptions", ["page"])[0]
1.6 parent = form.get("parent", [""])[0]
1.7 + resolution = form.get("resolution", ["month"])[0]
1.8
1.9 - calendar_start = EventAggregatorSupport.getFormDate(request, None, "start") or \
1.10 - EventAggregatorSupport.getFormMonth(request, None, "start")
1.11 - calendar_end = EventAggregatorSupport.getFormDate(request, None, "end") or \
1.12 - EventAggregatorSupport.getFormMonth(request, None, "end")
1.13 + calendar_start = resolution == "date" and EventAggregatorSupport.getFormDate(request, None, "start") or \
1.14 + resolution == "month" and EventAggregatorSupport.getFormMonth(request, None, "start")
1.15 + calendar_end = resolution == "date" and EventAggregatorSupport.getFormDate(request, None, "end") or \
1.16 + resolution == "month" and EventAggregatorSupport.getFormMonth(request, None, "end")
1.17
1.18 # Look for separate start and end parameters, either for complete dates
1.19 # or for years and months.
1.20 @@ -267,17 +268,6 @@
1.21
1.22 # Determine the period and get the events involved.
1.23
1.24 - if isinstance(calendar_start, EventAggregatorSupport.Date):
1.25 - if isinstance(calendar_end, EventAggregatorSupport.Date):
1.26 - resolution = "date"
1.27 - else:
1.28 - calendar_start = calendar_start.as_month()
1.29 - resolution = "month"
1.30 - else:
1.31 - resolution = "month"
1.32 - if isinstance(calendar_end, EventAggregatorSupport.Date):
1.33 - calendar_end = calendar_end.as_month()
1.34 -
1.35 events, shown_events, all_shown_events, earliest, latest = \
1.36 EventAggregatorSupport.getEvents(request, category_names, calendar_start, calendar_end,
1.37 resolution)