Merge lp:~bac/launchpad/bug-652149 into lp:launchpad
| Status: | Merged |
|---|---|
| Approved by: | Brad Crittenden on 2010-10-23 |
| Approved revision: | 11705 |
| Merged at revision: | 11789 |
| Proposed branch: | lp:~bac/launchpad/bug-652149 |
| Merge into: | lp:launchpad |
| Diff against target: |
485 lines (+192/-55) 8 files modified
lib/lp/code/browser/branchlisting.py (+3/-1) lib/lp/code/browser/branchvisibilitypolicy.py (+21/-14) lib/lp/code/browser/tests/test_branchlisting.py (+77/-13) lib/lp/code/stories/branches/xx-branch-visibility-policy.txt (+51/-15) lib/lp/code/templates/branch-visibility.pt (+2/-2) lib/lp/code/templates/project-branches.pt (+37/-8) lib/lp/registry/browser/project.py (+1/-1) lib/lp/testing/sampledata.py (+0/-1) |
| To merge this branch: | bzr merge lp:~bac/launchpad/bug-652149 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Curtis Hovey (community) | ui | Approve on 2010-10-20 | |
| Henning Eggers (community) | ui* | 2010-10-18 | Approve on 2010-10-20 |
| Jeroen T. Vermeulen (community) | code | Approve on 2010-10-19 | |
|
Review via email:
|
|||
Commit Message
Provide an indication of the default branch visibility rule for a project group and a link to 'Define branch visibility' for LP admins and commercial admins.
Description of the Change
= Summary =
The code view for a project group did not show the default branch rules.
It did have a link for 'Define branch visibility' but the permission on
it was wrong, so commercial admins did not see it.
== Proposed fix ==
Convert the template to main_side, add a portlet for the privacy setting
display and a portlet for the link to define branch visibility.
== Pre-implementation notes ==
Brief chat with Curtis.
== Implementation details ==
I included some drive-by fixes. Removed redundancy from
lp.testing.
product-branches to not use conditional paragraphs.
== Tests ==
bin/test -vvm lp.code -t TestProjectGrou
== Demo and Q/A ==
Visit a project group such as https:/
determine everything is in order.
= Launchpad lint =
Bah, I'll check to ensure the real lint issues are fixed.
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/
1: narrative uses a moin header.
67: source exceeds 78 characters.
94: narrative uses a moin header.
104: source exceeds 78 characters.
107: source exceeds 78 characters.
125: source exceeds 78 characters.
126: want exceeds 78 characters.
134: source exceeds 78 characters.
138: source exceeds 78 characters.
146: narrative uses a moin header.
198: narrative uses a moin header.
231: source exceeds 78 characters.
253: source exceeds 78 characters.
./lib/lp/
1388: E302 expected 2 blank lines, found 1
- 11699. By Brad Crittenden on 2010-10-18
-
Fixed lint
- 11700. By Brad Crittenden on 2010-10-18
-
Fixed lint
| Brad Crittenden (bac) wrote : | # |
Thanks Jeroen. All of the issues you raised are fixed.
- 11701. By Brad Crittenden on 2010-10-19
-
Do not use (expensive) browser in tests, refactor BranchVisiblity
PolicyMixin, streamline expected output in tests.
| Brad Crittenden (bac) wrote : | # |
Hi Henning,
Could you do a UI review, please? Screenshots available at:
http://
- 11702. By Brad Crittenden on 2010-10-20
-
Changed display of inherited branch vis policy for projects. Reverted change to product-
branches. pt.
| Henning Eggers (henninge) wrote : | # |
Hi Brad,
this looks very good, thank you. The icon misalignment I noticed must be related to other stuff. I see it all over Launchpad now.
I was about to make suggestions about avoiding adding the side portlets and thus losing horizontal space. Horizontal space is a little issue because the project group page has an extra column on the branch listing. The information could be placed in the top portlet but I don't know how long the list of teams might get. Having a long list of team exceptions before reaching the actual branches degrades the usefulness of the page. Maybe the list could have been placed under the branch listing.
But I realized that a project's code page already has that portlet about visibility in the same spot, so I guess this is consistent. IIRC 3.0 UI design removed side portlets from all pages expect project/application home pages?
So the only think I'd like you to think about is if the extra portlet for changing the visibilty. Could that not be integrated into the other portlet by adding an edit icon at the right place?
There is one little nitpick: forbidden-
But there are no real stoppers here, seeing that the use of side portlets seems to be appropriate here. Thank you!
Henning
| Brad Crittenden (bac) wrote : | # |
Thanks for the UI review Henning and Curtis.
I hadn't noticed the extra space at the bottom of the top portlet. I defeated it with a style="
For consistency with the other code branchlisting pages I prefer to keep the "Define branch visibility" link in a second portlet.
- 11703. By Brad Crittenden on 2010-10-22
-
Fixed portlet spacing
- 11704. By Brad Crittenden on 2010-10-22
-
Merge from devel. Encountered conflicts with branchlisting files.
- 11705. By Brad Crittenden on 2010-10-23
-
Merged new tests from devel

Looks fine, apart from a few things we discussed on IRC: view())
* Render & search views in your tests using BeautifulSoup(
* Multi-line strings would be nicer than ("line" "line") in tests.
* The view inherits from both LaunchpadFormView and, indirectly, LaunchpadView.