1.1 --- a/imipweb/resource.py Mon Sep 11 23:57:30 2017 +0200
1.2 +++ b/imipweb/resource.py Tue Sep 12 01:01:41 2017 +0200
1.3 @@ -304,7 +304,7 @@
1.4 else:
1.5 page.input(name=name, type=type, value=value, **kw)
1.6
1.7 - def menu(self, name, default, items, values=None, class_="", index=None):
1.8 + def menu(self, name, default, items, values=None, class_=""):
1.9
1.10 """
1.11 Show a select menu having the given 'name', set to the given 'default',
1.12 @@ -314,10 +314,7 @@
1.13 """
1.14
1.15 page = self.page
1.16 - values = values or self.env.get_args().get(name, [default])
1.17 - if index is not None:
1.18 - values = values[index:]
1.19 - values = values and values[0:1] or [default]
1.20 + values = values or [default]
1.21
1.22 page.select(name=name, class_=class_)
1.23 for v, label in items:
1.24 @@ -329,17 +326,12 @@
1.25 page.option(label, value=v)
1.26 page.select.close()
1.27
1.28 - def date_controls(self, name, default, index=None, show_tzid=True, read_only=False):
1.29 + def date_controls(self, name, default, show_tzid=True, read_only=False):
1.30
1.31 """
1.32 Show date controls for a field with the given 'name' and 'default' form
1.33 date value.
1.34
1.35 - If 'index' is specified, default field values will be overridden by the
1.36 - element from a collection of existing form values with the specified
1.37 - index; otherwise, field values will be overridden by a single form
1.38 - value.
1.39 -
1.40 If 'show_tzid' is set to a false value, the time zone menu will not be
1.41 provided.
1.42
1.43 @@ -381,7 +373,7 @@
1.44 for i in range(-7, 8):
1.45 d = base + timedelta(i)
1.46 items.append((format_datetime(d), self.format_date(d, "full")))
1.47 - self.menu("%s-date" % name, format_datetime(base), items, index=index)
1.48 + self.menu("%s-date" % name, format_datetime(base), items)
1.49
1.50 page.span.close()
1.51
1.52 @@ -413,11 +405,11 @@
1.53 self.control("%s-tzid" % name, "hidden", tzid)
1.54 page.span(tzid)
1.55 else:
1.56 - self.timezone_menu("%s-tzid" % name, tzid, index)
1.57 + self.timezone_menu("%s-tzid" % name, tzid)
1.58
1.59 page.span.close()
1.60
1.61 - def timezone_menu(self, name, default, index=None):
1.62 + def timezone_menu(self, name, default):
1.63
1.64 """
1.65 Show timezone controls using a menu with the given 'name', set to the
1.66 @@ -425,7 +417,7 @@
1.67 """
1.68
1.69 entries = [(tzid, tzid) for tzid in pytz.all_timezones]
1.70 - self.menu(name, default, entries, index=index)
1.71 + self.menu(name, default, entries)
1.72
1.73 class DateTimeFormUtilities:
1.74
1.75 @@ -557,7 +549,7 @@
1.76
1.77 if show_start:
1.78 page.div(class_="dt enabled")
1.79 - self.date_controls(_name("dtstart", "recur", index), period.get_form_start(), index=index, read_only=read_only)
1.80 + self.date_controls(_name("dtstart", "recur", index), period.get_form_start(), read_only=read_only)
1.81 if not read_only:
1.82 page.br()
1.83 page.label("Specify times", for_=_id("dttimes-enable", index), class_="time disabled enable")
1.84 @@ -570,7 +562,7 @@
1.85 self.control("recur-replaced", "hidden", period.replaced and str(index) or "")
1.86
1.87 else:
1.88 - self.date_controls(_name("dtend", "recur", index), period.get_form_end(), index=index, show_tzid=False, read_only=read_only)
1.89 + self.date_controls(_name("dtend", "recur", index), period.get_form_end(), show_tzid=False, read_only=read_only)
1.90 if not read_only:
1.91 page.div(class_="dt disabled")
1.92 page.label("Specify end date", for_=_id("dtend-enable", index), class_="enable")
1.93 @@ -619,11 +611,11 @@
1.94 if dt:
1.95 page.td(class_=css)
1.96 if show_start:
1.97 - self.date_controls(_name("dtstart", "recur", index), period.get_form_start(), index=index, read_only=True)
1.98 + self.date_controls(_name("dtstart", "recur", index), period.get_form_start(), read_only=True)
1.99 self.control("recur-origin", "hidden", period.origin or "")
1.100 self.control("recur-replaced", "hidden", period.replaced and str(index) or "")
1.101 else:
1.102 - self.date_controls(_name("dtend", "recur", index), period.get_form_end(), index=index, show_tzid=False, read_only=True)
1.103 + self.date_controls(_name("dtend", "recur", index), period.get_form_end(), show_tzid=False, read_only=True)
1.104 page.td.close()
1.105 else:
1.106 page.td("(Unrecognised date)")