Merge lp://staging/~gary/launchpad/bug-772763-edit-subscription into lp://staging/launchpad/db-devel
| Status: | Merged |
|---|---|
| Approved by: | Brad Crittenden |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 10585 |
| Proposed branch: | lp://staging/~gary/launchpad/bug-772763-edit-subscription |
| Merge into: | lp://staging/launchpad/db-devel |
| Diff against target: |
211 lines (+41/-61) 2 files modified
lib/lp/bugs/browser/bugsubscription.py (+29/-27) lib/lp/bugs/browser/tests/test_bugsubscription_views.py (+12/-34) |
| To merge this branch: | bzr merge lp://staging/~gary/launchpad/bug-772763-edit-subscription |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Brad Crittenden (community) | code | Approve | |
|
Review via email:
|
|||
Commit message
[incr] [r=bac][bug=772763] make the +subscribe page, shown as a form overlay when you subscribe or edit a subscription, have options that are pertinent to the new unmute functionality
Description of the change
This branch, primarily from Danilo, builds on the other mute work we have done recently to make unmuting restore previous direct bug subscriptions.
The only goal of this branch is to make the +subscribe page, shown as a form overlay when you subscribe or edit a subscription, have options that are pertinent to the new functionality. These changes are made, and tests are adjusted accordingly.
We no longer offer the option to unmute and edit your subscription simultaneously (and in fact unmuting will typically be done with a simple API-backed click in the UI rather than this form) so I removed the test for that case.
The UI is a bit odd after this branch in two ways. First, it relies on the JS branch that I mentioned before to be completely resolved. Second, in some cases it will show a single (pre-selected) radio button option. I would worry more about this if we were not about to readdress the entire UI for bug 772754, and if this were not a db-devel branch.
Thank you!
Gary
Gary this branch looks good save for the line we discussed on IRC that is oddly formatted:
if not self_subscribed and not(is_