1.1 --- a/imip_manager.py Tue Mar 10 19:25:15 2015 +0100
1.2 +++ b/imip_manager.py Tue Mar 10 19:30:23 2015 +0100
1.3 @@ -635,12 +635,19 @@
1.4 invite = args.has_key("invite")
1.5 cancel = args.has_key("cancel")
1.6 save = args.has_key("save")
1.7 -
1.8 - have_action = reply or discard or invite or cancel or save
1.9 + ignore = args.has_key("ignore")
1.10 +
1.11 + have_action = reply or discard or invite or cancel or save or ignore
1.12
1.13 if not have_action:
1.14 return ["action"]
1.15
1.16 + # If ignoring the object, return to the calendar.
1.17 +
1.18 + if ignore:
1.19 + self.redirect(self.env.get_path())
1.20 + return None
1.21 +
1.22 # Update the object.
1.23
1.24 if args.has_key("summary"):
1.25 @@ -814,9 +821,11 @@
1.26 page.p("An action is required for this request:")
1.27
1.28 page.p()
1.29 - page.input(name="reply", type="submit", value="Reply")
1.30 + page.input(name="reply", type="submit", value="Send reply")
1.31 page.add(" ")
1.32 - page.input(name="discard", type="submit", value="Discard")
1.33 + page.input(name="discard", type="submit", value="Discard event")
1.34 + page.add(" ")
1.35 + page.input(name="ignore", type="submit", value="Do nothing for now")
1.36 page.p.close()
1.37
1.38 if is_organiser:
1.39 @@ -824,18 +833,22 @@
1.40
1.41 if have_other_attendees:
1.42 page.p()
1.43 - page.input(name="invite", type="submit", value="Invite")
1.44 + page.input(name="invite", type="submit", value="Invite/notify attendees")
1.45 page.add(" ")
1.46 if is_request:
1.47 - page.input(name="discard", type="submit", value="Discard")
1.48 + page.input(name="discard", type="submit", value="Discard event")
1.49 else:
1.50 - page.input(name="cancel", type="submit", value="Cancel")
1.51 + page.input(name="cancel", type="submit", value="Cancel event")
1.52 + page.add(" ")
1.53 + page.input(name="ignore", type="submit", value="Do nothing for now")
1.54 page.p.close()
1.55 else:
1.56 page.p()
1.57 - page.input(name="save", type="submit", value="Save")
1.58 + page.input(name="save", type="submit", value="Save event")
1.59 page.add(" ")
1.60 - page.input(name="discard", type="submit", value="Discard")
1.61 + page.input(name="discard", type="submit", value="Discard event")
1.62 + page.add(" ")
1.63 + page.input(name="ignore", type="submit", value="Do nothing for now")
1.64 page.p.close()
1.65
1.66 property_items = [