1.1 --- a/EventAggregatorSupport.py Sat Nov 07 21:08:16 2009 +0100
1.2 +++ b/EventAggregatorSupport.py Sat Nov 07 21:36:36 2009 +0100
1.3 @@ -693,6 +693,16 @@
1.4 def getParameter(request, name, default=None):
1.5 return request.form.get(name, [default])[0]
1.6
1.7 +def getQualifiedParameter(request, calendar_name, argname, default=None):
1.8 + argname = getQualifiedParameterName(calendar_name, argname)
1.9 + return getParameter(request, argname, default)
1.10 +
1.11 +def getQualifiedParameterName(calendar_name, argname):
1.12 + if calendar_name is None:
1.13 + return argname
1.14 + else:
1.15 + return "%s-%s" % (calendar_name, argname)
1.16 +
1.17 def getParameterMonth(arg):
1.18 n = None
1.19
1.20 @@ -720,12 +730,7 @@
1.21 return date
1.22
1.23 def getFormMonth(request, calendar_name, argname):
1.24 - if calendar_name is None:
1.25 - calendar_prefix = argname
1.26 - else:
1.27 - calendar_prefix = "%s-%s" % (calendar_name, argname)
1.28 -
1.29 - arg = getParameter(request, calendar_prefix)
1.30 + arg = getQualifiedParameter(request, calendar_name, argname)
1.31 if arg is not None:
1.32 return getParameterMonth(arg)
1.33 else: