Merge lp:~danilo/launchpad/bug-772763-remove-unmute-dialog-part1 into lp:launchpad/db-devel
Status: | Merged |
---|---|
Approved by: | Данило Шеган |
Approved revision: | no longer in the source branch. |
Merged at revision: | 10582 |
Proposed branch: | lp:~danilo/launchpad/bug-772763-remove-unmute-dialog-part1 |
Merge into: | lp:launchpad/db-devel |
Diff against target: |
518 lines (+204/-54) 9 files modified
database/schema/security.cfg (+4/-0) lib/lp/bugs/browser/bug.py (+2/-4) lib/lp/bugs/browser/bugsubscription.py (+16/-7) lib/lp/bugs/browser/tests/test_bug_views.py (+24/-1) lib/lp/bugs/browser/tests/test_bugsubscription_views.py (+46/-13) lib/lp/bugs/interfaces/bug.py (+5/-3) lib/lp/bugs/model/bug.py (+15/-5) lib/lp/bugs/model/tests/test_bugsubscriptioninfo.py (+76/-21) lib/lp/bugs/tests/test_bug.py (+16/-0) |
To merge this branch: | bzr merge lp:~danilo/launchpad/bug-772763-remove-unmute-dialog-part1 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Abel Deuring (community) | code | Approve | |
Данило Шеган (community) | db | Abstain | |
Review via email: mp+61775@code.launchpad.net |
Commit message
[r=adeuring][bug=772763][incr] Ground-work for making "Unmute bug mail" unmute directly (and restoring any previous subscription) without popping up a dialog.
Description of the change
= Bug 772763: remove unmute dialog, part1 =
As part of solving 772763, we remove the pop-up unmute dialog (to directly unmute instead). To prepare for that, we first do some server-side cleanups and make unmute() method return the previously masked subscription (if any).
== Proposed fix ==
This branch does a few things:
- Make "static" (i.e. non-JS) page IBugTask:+mute not redirect to +subscribe to offer unmute but instead allow direct unmuting
- Ensures Mute/Unmute link is shown when bug is muted
- Takes mutes into consideration for all subscribers-
- Make unmute() method return a previous subscription (if any)
== Pre-implementation notes ==
This is mostly Gary's branch. I am only shepherding it and providing a few tests of my own.
== Implementation details ==
Not cleaning up the lint for the model/bug.py since it'd taint the diff.
== Tests ==
bin/test -cvvt TestBugSubscrip
== Demo and Q/A ==
Check that IBugTask:+mute page behaves as expected (iow, allows unmuting as well). Rest of the QA will be possible only when the follow-up branch lands.
= Launchpad lint =
Checking for conflicts and issues in changed files.
Linting changed files:
lib/lp/
lib/lp/
lib/lp/
lib/lp/
lib/lp/
lib/lp/
lib/lp/
lib/lp/
./lib/lp/
575: E225 missing whitespace around operator
747: E225 missing whitespace around operator
751: E225 missing whitespace around operator
766: E225 missing whitespace around operator
1461: E225 missing whitespace around operator
1674: E261 at least two spaces before inline comment
1676: E261 at least two spaces before inline comment
1687: E261 at least two spaces before inline comment
1689: E261 at least two spaces before inline comment
1707: E225 missing whitespace around operator
2262: E225 missing whitespace around operator
2277: E225 missing whitespace around operator
2287: E261 at least two spaces before inline comment
2325: E225 missing whitespace around operator
2587: E225 missing whitespace around operator
2628: E225 missing whitespace around operator