Merge lp:~deryck/launchpad/better-dupe-handling-ui into lp:launchpad
Status: | Merged |
---|---|
Approved by: | Aaron Bentley |
Approved revision: | no longer in the source branch. |
Merged at revision: | 11190 |
Proposed branch: | lp:~deryck/launchpad/better-dupe-handling-ui |
Merge into: | lp:launchpad |
Prerequisite: | lp:~deryck/launchpad/do-the-right-thing-dupe-move-78596 |
Diff against target: |
282 lines (+112/-17) 6 files modified
lib/canonical/launchpad/icing/style-3-0.css.in (+6/-0) lib/lp/bugs/doc/bugactivity.txt (+41/-1) lib/lp/bugs/javascript/bugtask_index.js (+38/-10) lib/lp/bugs/model/bug.py (+7/-0) lib/lp/bugs/templates/bug-portlet-actions.pt (+3/-3) lib/lp/bugs/windmill/tests/test_mark_duplicate.py (+17/-3) |
To merge this branch: | bzr merge lp:~deryck/launchpad/better-dupe-handling-ui |
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Paul Hummer (community) | ui | Approve | |
Matthew Revell (community) | text | Approve | |
Aaron Bentley (community) | Approve | ||
Review via email:
|
Commit message
Update the UI for the mark as duplicate widget to understand how to dupe a bug that has duplicates itself.
Description of the change
This branch finishes off the work of my do-the-
This branch does that UI work, plus fixes some other minor UI nits, namely:
* Fixes the style rules to ensure that the icon and text appear on the same line
* Focus the input field when the widget appears
* Fixes the widget to not add another edit icon when the DOM changes
* Adds a warning in the widget if the bug has dupes itself
* Fixes the activity log and adds test coverage
* Extends the Windmill test to cover changes to the widget
* Extends Windmill test to cover everything that was lost when dropping page tests in the earlier branch
Test:
Windmill:
./bin/test -cvvt test_mark_duplicate
Activity log changes:
./bin/test -cvvt doc/bugactivity.txt
Dupe handling unit test:
./bin/test -cvv test_duplicate_
Here's a screenshot of the new warning for the UI reviewer:
http:// people. canonical. com/~deryck/ mark-as- dupe-warning. png
This was pre-imp'ed pretty heavily with Curtis at the Epic, almost so that I would feel okay doing ui=sinzui. However, we didn't really analyze the text of the warning together. I think the text has the word "duplicate" too much, but I cannot think of a better wording since I'm too close to the work. So I offer this for UI review, but I'll also get mrevell to take a look at the text.