1.1 --- a/actions/EventAggregatorUpdate.py Wed May 01 00:04:59 2013 +0200
1.2 +++ b/actions/EventAggregatorUpdate.py Wed May 01 01:44:54 2013 +0200
1.3 @@ -6,8 +6,9 @@
1.4 @license: GNU GPL (v2 or later), see COPYING.txt for details.
1.5 """
1.6
1.7 -from MoinDateSupport import getParameterDate, getParameterMonth
1.8 +from EventAggregatorSupport.Actions import get_date_functions
1.9 from EventAggregatorSupport import *
1.10 +from MoinDateSupport import getParameterMonth
1.11 from MoinMoin.Page import Page
1.12 from MoinMoin import config
1.13
1.14 @@ -37,6 +38,7 @@
1.15 template_name = getParameter(request, "template")
1.16 parent_name = getParameter(request, "parent")
1.17 mode = getParameter(request, "mode", "calendar")
1.18 + raw_resolution = getParameter(request, "raw-resolution")
1.19 resolution = getParameter(request, "resolution", mode == "day" and "date" or "month")
1.20 map_name = getParameter(request, "map")
1.21
1.22 @@ -50,22 +52,21 @@
1.23
1.24 resolution = mode == "calendar" and "month" or resolution
1.25
1.26 - if resolution == "date":
1.27 - get_date = getParameterDate
1.28 - else:
1.29 - get_date = getParameterMonth
1.30 + # Determine the limits of the calendar.
1.31
1.32 - # Determine the limits of the calendar.
1.33 + get_date, _get_form_date = get_date_functions(raw_resolution)
1.34
1.35 original_calendar_start = calendar_start = get_date(raw_calendar_start)
1.36 original_calendar_end = calendar_end = get_date(raw_calendar_end)
1.37
1.38 + wider_calendar_start = getParameterMonth(getParameter(request, "wider-start"))
1.39 + wider_calendar_end = getParameterMonth(getParameter(request, "wider-end"))
1.40 +
1.41 + get_date, _get_form_date = get_date_functions(resolution)
1.42 +
1.43 calendar_start = get_date(getParameter(request, "start")) or calendar_start
1.44 calendar_end = get_date(getParameter(request, "end")) or calendar_end
1.45
1.46 - wider_calendar_start = getParameterMonth(getParameter(request, "wider-start"))
1.47 - wider_calendar_end = getParameterMonth(getParameter(request, "wider-end"))
1.48 -
1.49 # Get the events according to the resolution of the calendar.
1.50
1.51 all_shown_events, first, last = getEventsUsingParameters(
1.52 @@ -80,7 +81,7 @@
1.53 calendar_start, calendar_end,
1.54 wider_calendar_start, wider_calendar_end,
1.55 first, last, category_names, remote_sources, search_pattern, template_name,
1.56 - parent_name, mode, resolution, name_usage, map_name)
1.57 + parent_name, mode, raw_resolution, resolution, name_usage, map_name)
1.58
1.59 send_headers = get_send_headers(request)
1.60 send_headers(["Content-Type: text/html; charset=%s" % config.charset])