# HG changeset patch # User Paul Boddie # Date 1423521001 -3600 # Node ID 9c3033cbc232186e5c72ea4a8dec679d71ede914 # Parent c5f6b59023736d7aadc8687cafca5e7dc858e69e Moved the display of conflicting events into a separate method. diff -r c5f6b5902373 -r 9c3033cbc232 imip_manager.py --- a/imip_manager.py Mon Feb 09 23:22:31 2015 +0100 +++ b/imip_manager.py Mon Feb 09 23:30:01 2015 +0100 @@ -888,6 +888,24 @@ page.tbody.close() page.table.close() + self.show_conflicting_events(uid, obj) + self.show_request_controls(obj) + + page.form.close() + + def show_conflicting_events(self, uid, obj): + + """ + Show conflicting events for the object having the given 'uid' and + representation 'obj'. + """ + + page = self.page + + # Obtain the user's timezone. + + tzid = self.get_tzid() + dtstart = format_datetime(obj.get_utc_datetime("DTSTART")) dtend = format_datetime(obj.get_utc_datetime("DTEND")) @@ -949,9 +967,6 @@ page.tbody.close() page.table.close() - self.show_request_controls(obj) - page.form.close() - def show_requests_on_page(self): "Show requests for the current user."