1.1 --- a/imipweb/resource.py Sun Jul 26 02:01:24 2015 +0200
1.2 +++ b/imipweb/resource.py Sun Jul 26 23:43:26 2015 +0200
1.3 @@ -110,8 +110,7 @@
1.4 if self.objects.has_key((uid, recurrenceid)):
1.5 return self.objects[(uid, recurrenceid)]
1.6
1.7 - fragment = uid and self.store.get_event(self.user, uid, recurrenceid) or None
1.8 - obj = self.objects[(uid, recurrenceid)] = fragment and Object(fragment)
1.9 + obj = self.objects[(uid, recurrenceid)] = self.get_stored_object(uid, recurrenceid)
1.10 return obj
1.11
1.12 def _get_recurrences(self, uid):
1.13 @@ -127,7 +126,7 @@
1.14 def _get_request_summary(self):
1.15 summary = []
1.16 for uid, recurrenceid in self._get_requests():
1.17 - obj = self._get_object(uid, recurrenceid)
1.18 + obj = self.get_stored_object(uid, recurrenceid)
1.19 if obj:
1.20 periods = obj.get_periods(self.get_tzid(), self.get_window_end())
1.21 recurrenceids = self._get_recurrences(uid)
1.22 @@ -203,8 +202,7 @@
1.23
1.24 freebusy = self.store.get_freebusy(self.user)
1.25
1.26 - update_freebusy(freebusy,
1.27 - obj.get_periods(self.get_tzid(), self.get_window_end()),
1.28 + Client.update_freebusy(self, freebusy, self.get_periods(obj),
1.29 is_only_organiser and "ORG" or obj.get_value("TRANSP"),
1.30 uid, recurrenceid,
1.31 obj.get_value("SUMMARY"),