Merge lp:~gmb/launchpad/make-bugwatch-errors-less-obscure-bug-530113 into lp:launchpad/db-devel

[Graham Binns]

BugWatch errors will now be displayed in the tooltip of the warning icon in the bug task table.

This branch fixes bug 530113 by adding the error message for the last error encountered whilst updating a bug watch to the tooltip of the warning icon displayed in the bug task table.

I've updated the relevant page test to cover this change.

No lint.

[Abel Deuring (adeuring)]

review: Approve (code)

[Graham Binns (gmb)]

A screenshot for UI review purposes can be found here: https://devpad.canonical.com/~gbinns/tooltip.png

[Curtis Hovey (sinzui)]

This looks good.

review: Approve (ui)

=== modified file 'lib/lp/bugs/stories/bugwatches/xx-bugwatch-errors.txt'
--- lib/lp/bugs/stories/bugwatches/xx-bugwatch-errors.txt	2010-04-08 09:50:05 +0000
+++ lib/lp/bugs/stories/bugwatches/xx-bugwatch-errors.txt	2010-04-16 12:56:01 +0000
@@ -54,7 +54,19 @@
     The Mozilla.org Bug Tracker bug #900 appears not to exist. Check
     that the bug number is correct.
 
+<<<<<<< TREE
 We can observe this for each of the BugWatchActivityStatus failure values:
+=======
+It's also shown in the tooltip of the warning icon next to the bug watch
+in the bugtask table.
+
+    >>> icon = find_tag_by_id(user_browser.contents, 'bugwatch-error-sprite')
+    >>> print icon.get('title')
+    The Mozilla.org Bug Tracker bug #900 appears not to exist. Check
+    that the bug number is correct.
+
+We can observe this for each of the BugWatchActivityStatus values:
+>>>>>>> MERGE-SOURCE
 
     >>> from lp.bugs.interfaces.bugwatch import (
     ...     BUG_WATCH_ACTIVITY_SUCCESS_STATUSES)

=== modified file 'lib/lp/bugs/templates/bugtask-tasks-and-nominations-table-row.pt'
--- lib/lp/bugs/templates/bugtask-tasks-and-nominations-table-row.pt	2009-12-03 18:36:37 +0000
+++ lib/lp/bugs/templates/bugtask-tasks-and-nominations-table-row.pt	2010-04-16 12:56:01 +0000
@@ -115,7 +115,9 @@
             <span tal:condition="not:context/bugwatch/last_error_type"
                   class="sprite bug-remote"></span>
             <span tal:condition="context/bugwatch/last_error_type"
-                  class="sprite warning-icon"></span>
+                  class="sprite warning-icon"
+                  tal:attributes="title context/bugwatch/getLastErrorMessage"
+                  id="bugwatch-error-sprite"></span>
           </tal:bugtracker-active>
           <span tal:condition="not:context/bugwatch/bugtracker/active"
                 class="sprite warning-icon"></span>