1.1 --- a/imipweb/calendar.py Sat Sep 19 01:07:40 2015 +0200
1.2 +++ b/imipweb/calendar.py Sat Sep 19 01:08:17 2015 +0200
1.3 @@ -702,11 +702,22 @@
1.4 else:
1.5 page.td(class_=css, rowspan=span)
1.6
1.7 - # Only link to events if they are not being
1.8 - # updated by requests.
1.9 + # Only link to events if they are not being updated
1.10 + # by requests.
1.11 +
1.12 + if not p.summary or \
1.13 + group_type != "request" and self._have_request(p.uid, p.recurrenceid, None, True):
1.14 +
1.15 + page.span(p.summary or "(Participant is busy)")
1.16
1.17 - if not p.summary or self._have_request(p.uid, p.recurrenceid) and group_type != "request":
1.18 - page.span(p.summary or "(Participant is busy)")
1.19 + # Link to counter-proposals.
1.20 +
1.21 + elif group_type == "request" and self._have_request(p.uid, p.recurrenceid, "COUNTER", True):
1.22 + page.a(p.summary, href=self.link_to(p.uid, p.recurrenceid, "counter"))
1.23 +
1.24 + # Link to requests and events (including ones for
1.25 + # which counter-proposals exist).
1.26 +
1.27 else:
1.28 page.a(p.summary, href=self.link_to(p.uid, p.recurrenceid))
1.29