Launchpad itself

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

  1. make-bugwatch-errors-less-obscure-bug-530113
  2. Merge into db-devel
Proposed by Graham Binns
Status: Merged
Approved by: Graham Binns
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~gmb/launchpad/make-bugwatch-errors-less-obscure-bug-530113
Merge into: lp:launchpad/db-devel
Diff against target: 38 lines (+15/-1) (has conflicts)
2 files modified
lib/lp/bugs/stories/bugwatches/xx-bugwatch-errors.txt (+12/-0)
lib/lp/bugs/templates/bugtask-tasks-and-nominations-table-row.pt (+3/-1)
Text conflict in lib/lp/bugs/stories/bugwatches/xx-bugwatch-errors.txt
To merge this branch: bzr merge lp:~gmb/launchpad/make-bugwatch-errors-less-obscure-bug-530113
Reviewer Review Type Date Requested Status
Curtis Hovey (community) ui Approve
Abel Deuring (community) code Approve
Eleanor Berger ui* Pending
Review via email: mp+23541@code.launchpad.net

Commit message

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

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Abel Deuring (adeuring) :
review: Approve (code)
Revision history for this message
Graham Binns (gmb) wrote :

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

Revision history for this message
Curtis Hovey (sinzui) wrote :

This looks good.

review: Approve (ui)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/bugs/stories/bugwatches/xx-bugwatch-errors.txt'
2--- lib/lp/bugs/stories/bugwatches/xx-bugwatch-errors.txt 2010-04-08 09:50:05 +0000
3+++ lib/lp/bugs/stories/bugwatches/xx-bugwatch-errors.txt 2010-04-16 12:56:01 +0000
4@@ -54,7 +54,19 @@
5 The Mozilla.org Bug Tracker bug #900 appears not to exist. Check
6 that the bug number is correct.
7
8+<<<<<<< TREE
9 We can observe this for each of the BugWatchActivityStatus failure values:
10+=======
11+It's also shown in the tooltip of the warning icon next to the bug watch
12+in the bugtask table.
13+
14+ >>> icon = find_tag_by_id(user_browser.contents, 'bugwatch-error-sprite')
15+ >>> print icon.get('title')
16+ The Mozilla.org Bug Tracker bug #900 appears not to exist. Check
17+ that the bug number is correct.
18+
19+We can observe this for each of the BugWatchActivityStatus values:
20+>>>>>>> MERGE-SOURCE
21
22 >>> from lp.bugs.interfaces.bugwatch import (
23 ... BUG_WATCH_ACTIVITY_SUCCESS_STATUSES)
24
25=== modified file 'lib/lp/bugs/templates/bugtask-tasks-and-nominations-table-row.pt'
26--- lib/lp/bugs/templates/bugtask-tasks-and-nominations-table-row.pt 2009-12-03 18:36:37 +0000
27+++ lib/lp/bugs/templates/bugtask-tasks-and-nominations-table-row.pt 2010-04-16 12:56:01 +0000
28@@ -115,7 +115,9 @@
29 <span tal:condition="not:context/bugwatch/last_error_type"
30 class="sprite bug-remote"></span>
31 <span tal:condition="context/bugwatch/last_error_type"
32- class="sprite warning-icon"></span>
33+ class="sprite warning-icon"
34+ tal:attributes="title context/bugwatch/getLastErrorMessage"
35+ id="bugwatch-error-sprite"></span>
36 </tal:bugtracker-active>
37 <span tal:condition="not:context/bugwatch/bugtracker/active"
38 class="sprite warning-icon"></span>

Subscribers

People subscribed via source and target branches

to status/vote changes: