Merge lp:~gmb/launchpad/bug-644346 into lp:launchpad

[Graham Binns]

When a bug watch is deleted, the success notification will be added to the response after the deletion happens rather than before.

This branch fixes bug 644346 by moving the code that adds the success notification for deleting a watch to *after* the point where the watch is deleted.

[Gavin Panella (allenap)]

review: Approve

=== modified file 'lib/lp/bugs/browser/bugwatch.py'
--- lib/lp/bugs/browser/bugwatch.py	2010-08-27 10:00:21 +0000
+++ lib/lp/bugs/browser/bugwatch.py	2010-09-23 09:02:48 +0000
@@ -141,13 +141,14 @@
     @action('Delete Bug Watch', name='delete', condition=bugWatchIsUnlinked)
     def delete_action(self, action, data):
         bugwatch = self.context
-        self.request.response.addInfoNotification(
-            structured(
+        # Build the notification first, whilst we still have the data.
+        notification_message = structured(
             'The <a href="%(url)s">%(bugtracker)s #%(remote_bug)s</a>'
             ' bug watch has been deleted.',
             url=bugwatch.url, bugtracker=bugwatch.bugtracker.name,
-            remote_bug=bugwatch.remotebug))
+            remote_bug=bugwatch.remotebug)
         bugwatch.bug.removeWatch(bugwatch, self.user)
+        self.request.response.addInfoNotification(notification_message)
 
     def showResetActionCondition(self, action):
         """Return True if the reset action can be shown to this user."""