1.1 --- a/imip_manager.py Wed Feb 04 15:04:15 2015 +0100
1.2 +++ b/imip_manager.py Wed Feb 04 15:16:02 2015 +0100
1.3 @@ -511,11 +511,12 @@
1.4
1.5 # Page fragment methods.
1.6
1.7 - def show_request_controls(self, obj, needs_action):
1.8 + def show_request_controls(self, obj, needs_update):
1.9
1.10 """
1.11 Show form controls for a request concerning 'obj', indicating whether
1.12 - action is needed if 'needs_action' is specified as a true value.
1.13 + an update will be performed if 'needs_update' is specified as a true
1.14 + value.
1.15 """
1.16
1.17 page = self.page
1.18 @@ -535,10 +536,10 @@
1.19 else:
1.20 page.p("This request has not yet been dealt with.")
1.21
1.22 - if needs_action:
1.23 + if needs_update:
1.24 + page.p("This request can be updated as follows:")
1.25 + else:
1.26 page.p("An action is required for this request:")
1.27 - else:
1.28 - page.p("This request can be updated as follows:")
1.29
1.30 page.p()
1.31
1.32 @@ -557,7 +558,7 @@
1.33
1.34 # Updated objects need to have details updated upon sending.
1.35
1.36 - if not needs_action:
1.37 + if needs_update:
1.38 page.input(name="update", type="hidden", value="true")
1.39
1.40 page.p.close()
1.41 @@ -570,7 +571,7 @@
1.42 "ATTENDEE" : "Attendee",
1.43 }
1.44
1.45 - def show_object_on_page(self, uid, obj, needs_action):
1.46 + def show_object_on_page(self, uid, obj, needs_update):
1.47
1.48 """
1.49 Show the calendar object with the given 'uid' and representation 'obj'
1.50 @@ -684,7 +685,7 @@
1.51 if found_obj:
1.52 page.a(found_obj.get_value("SUMMARY"), href=self.env.new_url(found_uid))
1.53
1.54 - self.show_request_controls(obj, needs_action)
1.55 + self.show_request_controls(obj, needs_update)
1.56 page.form.close()
1.57
1.58 def show_requests_on_page(self):
1.59 @@ -779,7 +780,7 @@
1.60 return True
1.61
1.62 self.new_page(title="Event")
1.63 - self.show_object_on_page(uid, obj, is_request and not handled)
1.64 + self.show_object_on_page(uid, obj, not is_request)
1.65
1.66 return True
1.67