# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1442612676 -7200
# Node ID 67dfe17b2f9d4829c862d5ef0439808dcfa71a1b
# Parent  146c37781587cc021c8f25302d63286c3233e802
Updated request access to support request types.

diff -r 146c37781587 -r 67dfe17b2f9d imipweb/calendar.py
--- a/imipweb/calendar.py	Fri Sep 18 20:05:42 2015 +0200
+++ b/imipweb/calendar.py	Fri Sep 18 23:44:36 2015 +0200
@@ -176,8 +176,8 @@
 
             page.ul()
 
-            for uid, recurrenceid in requests:
-                obj = self.get_stored_object(uid, recurrenceid)
+            for uid, recurrenceid, request_type in requests:
+                obj = self._get_object(uid, recurrenceid)
                 if obj:
                     page.li()
                     page.a(obj.get_value("SUMMARY"), href="#request-%s-%s" % (uid, recurrenceid or ""))
@@ -705,7 +705,7 @@
                             # Only link to events if they are not being
                             # updated by requests.
 
-                            if not p.summary or (p.uid, p.recurrenceid) in self._get_requests() and group_type != "request":
+                            if not p.summary or self._have_request(p.uid, p.recurrenceid) and group_type != "request":
                                 page.span(p.summary or "(Participant is busy)")
                             else:
                                 page.a(p.summary, href=self.link_to(p.uid, p.recurrenceid))
diff -r 146c37781587 -r 67dfe17b2f9d imipweb/event.py
--- a/imipweb/event.py	Fri Sep 18 20:05:42 2015 +0200
+++ b/imipweb/event.py	Fri Sep 18 23:44:36 2015 +0200
@@ -430,7 +430,7 @@
 
         attendees = self.get_current_attendees(obj)
         is_attendee = self.user in attendees
-        is_request = (obj.get_uid(), obj.get_recurrenceid()) in self._get_requests()
+        is_request = self._have_request(obj.get_uid(), obj.get_recurrenceid())
 
         # Show appropriate options depending on the role of the user.
 
diff -r 146c37781587 -r 67dfe17b2f9d imipweb/resource.py
--- a/imipweb/resource.py	Fri Sep 18 20:05:42 2015 +0200
+++ b/imipweb/resource.py	Fri Sep 18 23:44:36 2015 +0200
@@ -127,13 +127,17 @@
             self.requests = self.store.get_requests(self.user)
         return self.requests
 
+    def _have_request(self, uid, recurrenceid=None):
+        requests = self._get_requests()
+        return self.store.have_request(requests, uid, recurrenceid)
+
     def _get_request_summary(self):
 
         "Return a list of periods comprising the request summary."
 
         summary = []
 
-        for uid, recurrenceid in self._get_requests():
+        for uid, recurrenceid, request_type in self._get_requests():
             obj = self.get_stored_object(uid, recurrenceid)
             if obj:
                 recurrenceids = self._get_active_recurrences(uid)