1.1 --- a/imipweb/calendar.py Thu Sep 24 19:37:37 2015 +0200
1.2 +++ b/imipweb/calendar.py Thu Sep 24 19:40:03 2015 +0200
1.3 @@ -687,7 +687,8 @@
1.4 "event",
1.5 has_continued and "continued" or "",
1.6 will_continue and "continues" or "",
1.7 - p.transp == "ORG" and "only-organising" or is_organiser and "organising" or "attending"
1.8 + p.transp == "ORG" and "only-organising" or is_organiser and "organising" or "attending",
1.9 + self._have_request(p.uid, p.recurrenceid, "COUNTER", True) and "counter" or "",
1.10 ])
1.11
1.12 # Only anchor the first cell of events.
1.13 @@ -710,11 +711,6 @@
1.14
1.15 page.span(p.summary or "(Participant is busy)")
1.16
1.17 - # Link to counter-proposals.
1.18 -
1.19 - elif group_type == "request" and self._have_request(p.uid, p.recurrenceid, "COUNTER", True):
1.20 - page.a(p.summary, href=self.link_to(p.uid, p.recurrenceid, "counter"))
1.21 -
1.22 # Link to requests and events (including ones for
1.23 # which counter-proposals exist).
1.24
2.1 --- a/imipweb/event.py Thu Sep 24 19:37:37 2015 +0200
2.2 +++ b/imipweb/event.py Thu Sep 24 19:40:03 2015 +0200
2.3 @@ -1083,8 +1083,8 @@
2.4
2.5 "Show an object request using the given 'path_info' for the current user."
2.6
2.7 - uid, recurrenceid, section = self.get_identifiers(path_info)
2.8 - obj = self.get_stored_object(uid, recurrenceid, section)
2.9 + uid, recurrenceid = self.get_identifiers(path_info)
2.10 + obj = self.get_stored_object(uid, recurrenceid)
2.11 self.set_object(obj)
2.12
2.13 if not obj:
3.1 --- a/imipweb/resource.py Thu Sep 24 19:37:37 2015 +0200
3.2 +++ b/imipweb/resource.py Thu Sep 24 19:40:03 2015 +0200
3.3 @@ -79,18 +79,16 @@
3.4 self.new_page(title="Redirect")
3.5 self.page.p("Redirecting to: %s" % url)
3.6
3.7 - def link_to(self, uid, recurrenceid=None, section=None):
3.8 + def link_to(self, uid, recurrenceid=None):
3.9
3.10 """
3.11 - Return a link to an object with the given 'uid', 'recurrenceid' and
3.12 - 'section'. See get_identifiers for the decoding of such links.
3.13 + Return a link to an object with the given 'uid' and 'recurrenceid'.
3.14 + See get_identifiers for the decoding of such links.
3.15 """
3.16
3.17 path = [uid]
3.18 if recurrenceid:
3.19 path.append(recurrenceid)
3.20 - if section:
3.21 - path.append(section)
3.22 return self.env.new_url("/".join(path))
3.23
3.24 # Control naming helpers.
3.25 @@ -118,20 +116,12 @@
3.26 # UID only.
3.27
3.28 if len(parts) == 1:
3.29 - return parts[0], None, None
3.30 -
3.31 - # UID and RECURRENCE-ID or UID and section.
3.32 + return parts[0], None
3.33
3.34 - elif len(parts) == 2:
3.35 - if parts[1] == "counter":
3.36 - return parts[0], None, "counters"
3.37 - else:
3.38 - return parts[0], parts[1], parts[2] == "counter" and "counters" or None
3.39 -
3.40 - # UID, RECURRENCE-ID and section.
3.41 + # UID and RECURRENCE-ID.
3.42
3.43 else:
3.44 - return parts[:3]
3.45 + return parts[:2]
3.46
3.47 def _get_object(self, uid, recurrenceid=None, section=None):
3.48 if self.objects.has_key((uid, recurrenceid, section)):