Launchpad itself

Merge lp:~jpds/launchpad/fix_499997 into lp:launchpad

  1. fix_499997
  2. Merge into devel
Proposed by Jonathan Davies
Status: Merged
Approved by: Aaron Bentley
Approved revision: not available
Merged at revision: 10112
Proposed branch: lp:~jpds/launchpad/fix_499997
Merge into: lp:launchpad
Diff against target: 43 lines (+8/-3)
3 files modified
lib/lp/bugs/stories/duplicate-bug-handling/20-show-bug-is-duplicate.txt (+1/-1)
lib/lp/bugs/templates/bug-comment-add-form.pt (+3/-1)
lib/lp/bugs/templates/bugtask-index.pt (+4/-1)
To merge this branch: bzr merge lp:~jpds/launchpad/fix_499997
Reviewer Review Type Date Requested Status
Aaron Bentley (community) code Approve
Review via email: mp+16608@code.launchpad.net

Commit message

In duplicate bug reports, link to the main report in the duplicate bug warning box.

To post a comment you must log in.
Revision history for this message
Jonathan Davies (jpds) wrote :

= Summary =

When bug reports are marked as duplicates, it's not obvious (little string "Duplicate of bug #NNNN") which bug the bug is a duplicate of. There should, ideally, be a link to the main report in the duplicate warning box.

This branch implements this linkage.

Revision history for this message
Aaron Bentley (abentley) wrote :

Looks good. Thanks for the test.

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/bugs/stories/duplicate-bug-handling/20-show-bug-is-duplicate.txt'
2--- lib/lp/bugs/stories/duplicate-bug-handling/20-show-bug-is-duplicate.txt 2009-06-12 16:36:02 +0000
3+++ lib/lp/bugs/stories/duplicate-bug-handling/20-show-bug-is-duplicate.txt 2010-01-04 15:04:14 +0000
4@@ -9,7 +9,7 @@
5 bug #1...
6 >>> for message in find_tags_by_class(user_browser.contents, 'message'):
7 ... print extract_text(message)
8- Remember...Comment here only if...
9+ Remember, this bug report is a duplicate of bug #1. Comment here only if...
10
11 The "Affects" lines are also not expandable, preventing people from changing
12 the bug's status to no effect.
13
14=== modified file 'lib/lp/bugs/templates/bug-comment-add-form.pt'
15--- lib/lp/bugs/templates/bug-comment-add-form.pt 2009-07-17 17:59:07 +0000
16+++ lib/lp/bugs/templates/bug-comment-add-form.pt 2010-01-04 15:04:14 +0000
17@@ -8,7 +8,9 @@
18 class="warning message"
19 id="warning-comment-on-duplicate"
20 >
21- Remember, this bug report is a duplicate.
22+ Remember, this bug report is a duplicate of
23+ <a href="#" tal:attributes="href context/bug/duplicateof/fmt:url">bug
24+ #<span tal:replace="context/bug/duplicateof/id">42</span></a>.
25 Comment here only if you think the duplicate status is wrong.
26 </div>
27 <input
28
29=== modified file 'lib/lp/bugs/templates/bugtask-index.pt'
30--- lib/lp/bugs/templates/bugtask-index.pt 2009-12-03 18:36:37 +0000
31+++ lib/lp/bugs/templates/bugtask-index.pt 2010-01-04 15:04:14 +0000
32@@ -266,7 +266,10 @@
33 tal:condition="context/bug/duplicateof"
34 class="warning message"
35 id="warning-comment-on-duplicate">
36- Remember, this bug report is a duplicate.
37+ Remember, this bug report is a duplicate of
38+ <a href="#" tal:attributes="href
39+ context/bug/duplicateof/fmt:url">bug #<span
40+ tal:replace="context/bug/duplicateof/id">42</span></a>.
41 Comment here only if you think the duplicate status is wrong.
42 </div>
43 <h2>Add comment</h2>