1.1 --- a/imip_manager.py Tue Mar 10 19:30:23 2015 +0100
1.2 +++ b/imip_manager.py Tue Mar 10 19:40:45 2015 +0100
1.3 @@ -929,14 +929,14 @@
1.4 # Obtain the datetime.
1.5
1.6 if name == "DTSTART":
1.7 - dt, attr, event_tzid = dtstart, dtstart_attr, dtstart_attr.get("TZID", tzid)
1.8 + dt, attr = dtstart, dtstart_attr
1.9
1.10 # Where no end datetime exists, use the start datetime as the
1.11 # basis of any potential datetime specified if dt-control is
1.12 # set.
1.13
1.14 else:
1.15 - dt, attr, event_tzid = dtend or dtstart, dtend_attr or dtstart_attr, (dtend_attr or dtstart_attr).get("TZID", tzid)
1.16 + dt, attr = dtend or dtstart, dtend_attr or dtstart_attr
1.17
1.18 # Show controls for editing as organiser.
1.19
1.20 @@ -950,7 +950,7 @@
1.21 page.div.close()
1.22
1.23 page.div(class_="dt enabled")
1.24 - self._show_date_controls(field, value, attr, tzid)
1.25 + self._show_date_controls(field, value, attr)
1.26 if name == "DTSTART":
1.27 page.br()
1.28 page.label("Specify times", for_="dttimes-enable", class_="time disabled enable")
1.29 @@ -1888,18 +1888,17 @@
1.30 page.option(label, value=v)
1.31 page.select.close()
1.32
1.33 - def _show_date_controls(self, name, default, attr, tzid):
1.34 + def _show_date_controls(self, name, default, attr):
1.35
1.36 """
1.37 Show date controls for a field with the given 'name' and 'default' value
1.38 - and 'attr', with the given 'tzid' being used if no other time regime
1.39 - information is provided.
1.40 + and 'attr'.
1.41 """
1.42
1.43 page = self.page
1.44 args = self.env.get_args()
1.45
1.46 - event_tzid = attr.get("TZID", tzid)
1.47 + event_tzid = attr.get("TZID", self.get_tzid())
1.48 dt = get_datetime(default, attr)
1.49
1.50 # Show dates for up to one week around the current date.