1.1 --- a/actions/EventAggregatorNewEvent.py Thu Jul 08 02:17:12 2010 +0200
1.2 +++ b/actions/EventAggregatorNewEvent.py Thu Jul 08 22:15:54 2010 +0200
1.3 @@ -28,19 +28,6 @@
1.4
1.5 "An event creation dialogue requesting various parameters."
1.6
1.7 - def _get_selected(self, value, input_value):
1.8 - return input_value is not None and value == input_value and 'selected="selected"' or ''
1.9 -
1.10 - def _get_selected_for_list(self, value, input_values):
1.11 - return value in input_values and 'selected="selected"' or ''
1.12 -
1.13 - def _get_input(self, form, name, default=None):
1.14 - value = form.get(name, [None])[0]
1.15 - if not value: # true if 0 obtained
1.16 - return default
1.17 - else:
1.18 - return int(value)
1.19 -
1.20 def get_form_html(self, buttons_html):
1.21 _ = self._
1.22 request = self.request
1.23 @@ -95,20 +82,8 @@
1.24
1.25 # Initialise month lists.
1.26
1.27 - start_month_list = []
1.28 - end_month_list = []
1.29 -
1.30 - start_month = self._get_input(form, "start-month", EventAggregatorSupport.getCurrentMonth().month())
1.31 - end_month = self._get_input(form, "end-month", start_month)
1.32 -
1.33 - # Prepare month lists, selecting specified months.
1.34 -
1.35 - for month in range(1, 13):
1.36 - month_label = _(EventAggregatorSupport.getMonthLabel(month))
1.37 - selected = self._get_selected(month, start_month)
1.38 - start_month_list.append('<option value="%02d" %s>%s</option>' % (month, selected, month_label))
1.39 - selected = self._get_selected(month, end_month)
1.40 - end_month_list.append('<option value="%02d" %s>%s</option>' % (month, selected, month_label))
1.41 + start_month_list, end_month_list = self.get_month_lists()
1.42 + start_year_default, end_year_default = self.get_year_defaults()
1.43
1.44 # Initialise regime lists.
1.45
1.46 @@ -151,7 +126,7 @@
1.47
1.48 "start_label" : _("Start date (day, month, year)"),
1.49 "start_day_default" : form.get("start-day", [""])[0],
1.50 - "start_year_default" : form.get("start-year", [""])[0] or EventAggregatorSupport.getCurrentYear(),
1.51 + "start_year_default" : start_year_default,
1.52 "start_time_label" : _("Start time (hour, minute, second)"),
1.53 "start_hour_default" : form.get("start-hour", [""])[0],
1.54 "start_minute_default" : form.get("start-minute", [""])[0],
1.55 @@ -160,7 +135,7 @@
1.56
1.57 "end_label" : _("End date (day, month, year) - if different"),
1.58 "end_day_default" : form.get("end-day", [""])[0] or form.get("start-day", [""])[0],
1.59 - "end_year_default" : form.get("end-year", [""])[0] or form.get("start-year", [""])[0],
1.60 + "end_year_default" : end_year_default,
1.61 "end_time_label" : _("End time (hour, minute, second)"),
1.62 "end_hour_default" : form.get("end-hour", [""])[0],
1.63 "end_minute_default" : form.get("end-minute", [""])[0],