Merge lp:~jcsackett/launchpad/unknown-blueprints-service-597738 into lp:launchpad
- unknown-blueprints-service-597738
- Merge into devel
| Status: | Merged |
|---|---|
| Approved by: | Curtis Hovey |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 11571 |
| Proposed branch: | lp:~jcsackett/launchpad/unknown-blueprints-service-597738 |
| Merge into: | lp:launchpad |
| Prerequisite: | lp:~jcsackett/launchpad/deprecate-remaining-official-bools |
| Diff against target: |
914 lines (+464/-59) 13 files modified
lib/lp/blueprints/browser/configure.zcml (+4/-8) lib/lp/blueprints/browser/specificationtarget.py (+82/-7) lib/lp/blueprints/browser/tests/test_specificationtarget.py (+127/-3) lib/lp/blueprints/stories/blueprints/xx-creation.txt (+71/-29) lib/lp/blueprints/stories/blueprints/xx-productseries.txt (+12/-0) lib/lp/blueprints/stories/standalone/xx-batching.txt (+19/-5) lib/lp/blueprints/stories/standalone/xx-index.txt (+14/-0) lib/lp/blueprints/stories/standalone/xx-overview.txt (+11/-0) lib/lp/blueprints/stories/standalone/xx-views.txt (+21/-4) lib/lp/blueprints/templates/unknown-specs.pt (+93/-0) lib/lp/registry/browser/distribution.py (+7/-0) lib/lp/registry/browser/product.py (+1/-1) lib/lp/registry/browser/tests/pillar-views.txt (+2/-2) |
| To merge this branch: | bzr merge lp:~jcsackett/launchpad/unknown-blueprints-service-597738 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Curtis Hovey (community) | ui | Approve | |
| Guilherme Salgado (community) | ui* | Approve | |
| Brad Crittenden (community) | code | Approve | |
| Registry Administrators | ui | Pending | |
|
Review via email:
|
|||
Commit message
Updates the blueprints service page to use the blueprints_usage enum and display relevant data for each setting.
Description of the change
= Summary =
Updates the blueprints service to present relevant data for the UNKNOWN, EXTERNAL, and NOT_APPLICABLE settings of the blueprints_usage enum.
== Proposed fix ==
Modify the template and/or view to detect the usage status and present the correct template/info.
== Pre-implementation notes ==
Spoke with Curtis Hovey (sinzui) and Brad Crittenden (bac).
== Implementation details ==
The HasSpecificatio
The new template presents slightly different information based on the enum case, and provides some basic controls if relevant (e.g. configure blueprints if the user has edit permissions).
== Tests ==
bin/test -vvcm lp.blueprints.
== Demo and Q/A ==
In Launchpad.dev, signed in as admin, go to http://
Linting changed files:
lib/lp/
lib/lp/
lib/lp/
lib/lp/
lib/lp/
lib/lp/
lib/lp/
lib/lp/
lib/lp/
lib/lp/
lib/lp/
lib/lp/
lib/lp/
lib/lp/
lib/lp/
lib/lp/
lib/lp/
lib/lp/
lib/lp/
lib/lp/
lib/lp/
lib/lp/
lib/lp/
lib/lp/
Lint output corrupted by merged dependent branch.
| j.c.sackett (jcsackett) wrote : | # |
| Brad Crittenden (bac) wrote : | # |
Hi Jon,
Thanks for working on this branch. I was unaware of the added
complexity of the whole template/
I like the work you've done here modulo the on-going discussion with
Gary about a better approach to the template swapping. I'm marking
the MP 'needs information' so I can track the change you come up with,
but the branch is very close.
You mentioned lint being confused by the dependency on another
branch. Even so, please ensure these are not for real:
./lib/lp/
251: E301 expected 1 blank line, found 0
254: E301 expected 1 blank line, found 0
./lib/lp/
38: Line has trailing whitespace.
./lib/lp/
582: source exceeds 78 characters.
584: source exceeds 78 characters.
> === modified file 'lib/lp/
> --- lib/lp/
> +++ lib/lp/
> @@ -15,6 +15,7 @@
>
> from operator import itemgetter
>
> +from z3c.ptcompat import ViewPageTemplat
> from zope.component import queryMultiAdapter
>
> from canonical.config import config
> @@ -32,6 +33,8 @@
> Link,
> )
> from canonical.
> +from lp.app.enums import service_
> +from lp.app.
> from lp.blueprints.
> SpecificationFi
> SpecificationSort,
> @@ -133,6 +136,50 @@
> is_sprint = False
> has_drivers = False
>
> + # Templates for the various conditions of blueprints:
> + # * On Launchpad
> + # * External
> + # * Disabled
> + # * Unknown
> + default_template = ViewPageTemplat
> + '../templates/
> + not_launchpad_
> + '../templates/
> +
> + @property
> + def template(self):
> + # If the template has been defined in the zcml, use that, as this
> + # isn't the base service page for blueprints.
> + if hasattr(self, 'index'):
As we discussed on IRC, you should use 'safe_hasattr' from
canonical.
see if there is a more obvious technique for this. Sadly I cannot
offer any other solution.
> + return super(HasSpecif
> +
> + # Sprints and Persons don't have a usage enum for blueprints, so we
> + # have to fallback to the default.
> + if (ISprint.
> + or IPerson.
> + return self.default_
> +
> + # ProjectGroups are a special case, as their products may be a
> + # combination of usage settings. Use the default, since it handles
> + # fetching anything that's set for ProjectGroups, and it's not correct
> + # to say anything about the ProjectGroup's usage.
> + if IProjectGroup.
> + return self.default_
> +
> + # If specific...
| Curtis Hovey (sinzui) wrote : | # |
On Fri, 2010-09-10 at 15:59 +0000, Brad Crittenden wrote:
> > + @property
> > + def template(self):
> > + # If the template has been defined in the zcml, use that,
> as this
> > + # isn't the base service page for blueprints.
> > + if hasattr(self, 'index'):
>
> As we discussed on IRC, you should use 'safe_hasattr' from
> canonical.
> see if there is a more obvious technique for this. Sadly I cannot
> offer any other solution.
We can abandon safe_hasattr when lpnet is on lucid. This issue was fixed
several years ago in pythong 2.6
| Brad Crittenden (bac) wrote : | # |
Good changes Jon. Please alphabetize the imports where you added safe_hasattr.
| Guilherme Salgado (salgado) wrote : | # |
The UI changes look good to me, although it's confusing that the new template (lib/lp/
| Curtis Hovey (sinzui) wrote : | # |
Gentleman, I think the reviewers and developers need to consider why we are making this change, and what we are really changing.
Our goal is to communicate to the user where certain kinds of activities are performed--which site does the user need to visit to complete his goal. Launchpad blueprints is a branded service that provides specifications and documentation. The page needs to be talking about "specifications and documentation" because other sites, most often wikis, do not use the term blueprints. We want to allow the users to provide a URL when they choose external (maybe repurpose the wiki field). The page is not really stating that Launchpad Blueprints allows the user to track specifications and documentation...I see no reason why I would turn the feature on since it does not have a sentence stating the basics of what it is for. Specification itself may be too technical. This app is essentially about planning and documenting features.
My other concern is about what has specifications--a SpecificationTa
jcsackett, Salgado, take a look at the branch again from the perspective of kinds of users who are interested in feature planning.
| j.c.sackett (jcsackett) wrote : | # |
I just discovered I missed comments within the diff; sorry for not replying on Friday.
> If the enum is wrong, how will the user get here? The tab will be
> disabled, so we assume they have a direct URL?
I'm not sure the tab will be disabled--if no blueprints existed, and the enum said "EXTERNAL" or something, you could still get to this view so the "${Pillar} does not use blueprints" could be displayed. In this instance if it's set to EXTERNAL but people have been using the blueprints, we continue to display the blueprints information when you get here.
The involvement menu link is disabled, but the tab along the top of the page is still there, and of course nothing stops someone from going to blueprints.
Now, I'm open to debate on whether we should just turn off the feature regardless of whether or not blueprints are already being used--I erred on the side of not allowing someone to just delete a bunch of work, but that might not be the decision we want to make here.
>> self.verify_
>
> You didn't introduce it, but please fix the typo of s/verify_
Uhm, not sure what you mean--looks like it already is verify_involvement?
>> def test_adaptable_
>> @@ -87,6 +92,63 @@
>> '<div id="involvement" class="portlet involvement">' in view())
>>
>>
>> +class TestHasSpecific
>> + """Tests the selection of templates based on blueprints usage."""
>> +
>> + layer = DatabaseFunctio
>> +
>> + def setUp(self):
>> + super(TestHasSp
>> + self.user = self.factory.
>> + self.product = self.factory.
>> + self.naked_product = removeSecurityP
>> + login_person(
>
> While I'm not a prude, I must ask why all of the nakedness here?
> Couldn't you just make self.user be the owner of the product and
> proceed fully clothed?
I wanted to test what a non-owner user has happen here; that may be the same thing as self.user, but it may not--I've been bitten by using owners/admins in the past.
> Why use 'specifications' just the once? The page says 'blueprints'
> six times and it is unclear that specifications and blueprints are the
> same from the context.
>
> Should we be more frank:
>
> <project> tracks specifications somewhere besides Launchpad, but we
> don't know where. You should check with the project maintainers for
> the location.
>
> I'm just throwing that out for thought. I'm not sure I even like the idea.
I'm playing with this right now related to the UI review; neither blueprints nor specifications are totally right for the copy, per Curtis's comments.
But consider your comments thrown into the mix.
> Thanks for the additional drive-by fixes.
I do what I can. :-P
| Curtis Hovey (sinzui) wrote : | # |
On Mon, 2010-09-13 at 19:54 +0000, j.c.sackett wrote:
>
> The involvement menu link is disabled, but the tab along the top of
> the page is still there, and of course nothing stops someone from
> going to blueprints.
>
> Now, I'm open to debate on whether we should just turn off the feature
> regardless of whether or not blueprints are already being used--I
> erred on the side of not allowing someone to just delete a bunch of
> work, but that might not be the decision we want to make here.
The complaint from project owners is that users created blueprints on
Launchpad instead of the upstream wiki. The project owner can enable
blueprints if he chooses to. Blueprints should be off until enabled.
I went to firefox in lp.dev and saw blueprints on. As the owner of the
project I decided to turn blueprints off, so I choses the configure
link, and was surprised that Blueprints was off. More over, Saving the
state of unknown did not disable blueprints. The state of the app does
not work like answers. Remember, we are working on other applications to
ensure all apps have the same kind of behaviours.
--
__Curtis C. Hovey_________
http://
| j.c.sackett (jcsackett) wrote : | # |
> The complaint from project owners is that users created blueprints on
> Launchpad instead of the upstream wiki. The project owner can enable
> blueprints if he chooses to. Blueprints should be off until enabled.
>
> I went to firefox in lp.dev and saw blueprints on. As the owner of the
> project I decided to turn blueprints off, so I choses the configure
> link, and was surprised that Blueprints was off. More over, Saving the
> state of unknown did not disable blueprints. The state of the app does
> not work like answers. Remember, we are working on other applications to
> ensure all apps have the same kind of behaviours.
I can buy this argument, totally. I've removed the conditional that prioritizes the existence of blueprints over the status of the enum.
| j.c.sackett (jcsackett) wrote : | # |
> Our goal is to communicate to the user where certain kinds of activities are
> performed--which site does the user need to visit to complete his goal.
> Launchpad blueprints is a branded service that provides specifications and
> documentation. The page needs to be talking about "specifications and
> documentation" because other sites, most often wikis, do not use the term
> blueprints.
Given this, I've updated the template to refer to the notion of documentation, and feature planning. In the instance where blueprints is set active, I've left the template alone, as the process of setting it up tells the user that Blueprints is a branded way that Launchpad does feature planning and documentation.
> We want to allow the users to provide a URL when they choose
> external (maybe repurpose the wiki field).
Based on our prior conversation I thought we were going to simply default to "There is a wiki for this project, which may be used for this purpose," with a link to the wiki if it exists, rather than introducing an extra db field to track an external specification tracking url.
I do think it may be worthwhile to circle back and add that field and get that information (for blueprints, answers, and translations) so we can provide a specific external place, but I think those changes are out of scope for this branch.
> The page is not really stating that
> Launchpad Blueprints allows the user to track specifications and
> documentation...I see no reason why I would turn the feature on since it does
> not have a sentence stating the basics of what it is for.
Agreed; I've updated what the page says to address this.
An incremental diff with these changes is attached.
I'll be addressing your other concerns re: specificationtarget next.
| 1 | === modified file 'lib/lp/blueprints/browser/specificationtarget.py' | |||
| 2 | --- lib/lp/blueprints/browser/specificationtarget.py 2010-09-13 20:21:10 +0000 | |||
| 3 | +++ lib/lp/blueprints/browser/specificationtarget.py 2010-09-14 15:49:09 +0000 | |||
| 4 | @@ -26,6 +26,7 @@ | |||
| 5 | 26 | canonical_url, | 26 | canonical_url, |
| 6 | 27 | LaunchpadView, | 27 | LaunchpadView, |
| 7 | 28 | ) | 28 | ) |
| 8 | 29 | from canonical.launchpad.webapp.authorization import check_permission | ||
| 9 | 29 | from canonical.launchpad.webapp.batching import BatchNavigator | 30 | from canonical.launchpad.webapp.batching import BatchNavigator |
| 10 | 30 | from canonical.launchpad.webapp.breadcrumb import Breadcrumb | 31 | from canonical.launchpad.webapp.breadcrumb import Breadcrumb |
| 11 | 31 | from canonical.launchpad.webapp.menu import ( | 32 | from canonical.launchpad.webapp.menu import ( |
| 12 | @@ -219,6 +220,15 @@ | |||
| 13 | 219 | size=config.launchpad.default_batch_size) | 220 | size=config.launchpad.default_batch_size) |
| 14 | 220 | 221 | ||
| 15 | 221 | @property | 222 | @property |
| 16 | 223 | def can_configure_blueprints(self): | ||
| 17 | 224 | """Can the user configure blueprints for the `ISpecificationTarget`.""" | ||
| 18 | 225 | target = self.context | ||
| 19 | 226 | if IProduct.providedBy(target) or IDistribution.providedBy(target): | ||
| 20 | 227 | return check_permission('launchpad.Edit', self.context) | ||
| 21 | 228 | else: | ||
| 22 | 229 | return False | ||
| 23 | 230 | |||
| 24 | 231 | @property | ||
| 25 | 222 | def label(self): | 232 | def label(self): |
| 26 | 223 | mapping = {'name': self.context.displayname} | 233 | mapping = {'name': self.context.displayname} |
| 27 | 224 | if self.is_person: | 234 | if self.is_person: |
| 28 | 225 | 235 | ||
| 29 | === modified file 'lib/lp/blueprints/browser/tests/test_specificationtarget.py' | |||
| 30 | --- lib/lp/blueprints/browser/tests/test_specificationtarget.py 2010-09-09 18:11:41 +0000 | |||
| 31 | +++ lib/lp/blueprints/browser/tests/test_specificationtarget.py 2010-09-14 15:47:58 +0000 | |||
| 32 | @@ -18,7 +18,10 @@ | |||
| 33 | 18 | login_person, | 18 | login_person, |
| 34 | 19 | TestCaseWithFactory, | 19 | TestCaseWithFactory, |
| 35 | 20 | ) | 20 | ) |
| 37 | 21 | from lp.testing.views import create_view | 21 | from lp.testing.views import ( |
| 38 | 22 | create_view, | ||
| 39 | 23 | create_initialized_view, | ||
| 40 | 24 | ) | ||
| 41 | 22 | 25 | ||
| 42 | 23 | 26 | ||
| 43 | 24 | class TestRegisterABlueprintButtonView(TestCaseWithFactory): | 27 | class TestRegisterABlueprintButtonView(TestCaseWithFactory): |
| 44 | @@ -149,6 +152,38 @@ | |||
| 45 | 149 | view.template.filename) | 152 | view.template.filename) |
| 46 | 150 | 153 | ||
| 47 | 151 | 154 | ||
| 48 | 155 | class TestHasSpecificationsConfiguration(TestCaseWithFactory): | ||
| 49 | 156 | |||
| 50 | 157 | layer = DatabaseFunctionalLayer | ||
| 51 | 158 | |||
| 52 | 159 | def test_cannot_configure_blueprints_product_no_edit_permission(self): | ||
| 53 | 160 | product = self.factory.makeProduct() | ||
| 54 | 161 | view = create_initialized_view(product, '+specs') | ||
| 55 | 162 | self.assertEqual(False, view.can_configure_blueprints) | ||
| 56 | 163 | |||
| 57 | 164 | def test_can_configure_blueprints_product_with_edit_permission(self): | ||
| 58 | 165 | product = self.factory.makeProduct() | ||
| 59 | 166 | login_person(product.owner) | ||
| 60 | 167 | view = create_initialized_view(product, '+specs') | ||
| 61 | 168 | self.assertEqual(True, view.can_configure_blueprints) | ||
| 62 | 169 | |||
| 63 | 170 | def test_cannot_configure_blueprints_distribution_no_edit_permission(self): | ||
| 64 | 171 | distribution = self.factory.makeDistribution() | ||
| 65 | 172 | view = create_initialized_view(distribution, '+specs') | ||
| 66 | 173 | self.assertEqual(False, view.can_configure_blueprints) | ||
| 67 | 174 | |||
| 68 | 175 | def test_can_configure_blueprints_distribution_with_edit_permission(self): | ||
| 69 | 176 | distribution = self.factory.makeDistribution() | ||
| 70 | 177 | login_person(distribution.owner) | ||
| 71 | 178 | view = create_initialized_view(distribution, '+specs') | ||
| 72 | 179 | self.assertEqual(True, view.can_configure_blueprints) | ||
| 73 | 180 | |||
| 74 | 181 | def test_cannot_configure_blueprints_projectgroup_with_edit_permission(self): | ||
| 75 | 182 | project_group = self.factory.makeProject() | ||
| 76 | 183 | login_person(project_group.owner) | ||
| 77 | 184 | view = create_initialized_view(project_group, '+specs') | ||
| 78 | 185 | self.assertEqual(False, view.can_configure_blueprints) | ||
| 79 | 186 | |||
| 80 | 152 | def test_suite(): | 187 | def test_suite(): |
| 81 | 153 | suite = unittest.TestSuite() | 188 | suite = unittest.TestSuite() |
| 82 | 154 | suite.addTest(unittest.TestLoader().loadTestsFromName(__name__)) | 189 | suite.addTest(unittest.TestLoader().loadTestsFromName(__name__)) |
| 83 | 155 | 190 | ||
| 84 | === modified file 'lib/lp/blueprints/templates/unknown-specs.pt' | |||
| 85 | --- lib/lp/blueprints/templates/unknown-specs.pt 2010-09-10 16:34:26 +0000 | |||
| 86 | +++ lib/lp/blueprints/templates/unknown-specs.pt 2010-09-14 16:02:38 +0000 | |||
| 87 | @@ -11,49 +11,47 @@ | |||
| 88 | 11 | 11 | ||
| 89 | 12 | <div metal:fill-slot="main" | 12 | <div metal:fill-slot="main" |
| 90 | 13 | tal:define="specs view/specs; | 13 | tal:define="specs view/specs; |
| 115 | 14 | has_any_specs view/has_any_specifications"> | 14 | has_any_specs view/has_any_specifications; |
| 116 | 15 | 15 | blueprints_usage view/context/blueprints_usage"> | |
| 117 | 16 | <div tal:condition="view/context/blueprints_usage/enumvalue:EXTERNAL"> | 16 | <div class="top-portlet"> |
| 118 | 17 | <strong><tal:project replace="view/context/displayname" /> does not use Launchpad | 17 | <div id="specs-unknown"> |
| 119 | 18 | for specification tracking.</strong> | 18 | <strong> |
| 120 | 19 | </div> | 19 | <p tal:condition="blueprints_usage/enumvalue:EXTERNAL"> |
| 121 | 20 | 20 | <tal:project replace="view/context/displayname" /> does not use Launchpad | |
| 122 | 21 | <div tal:condition="view/context/blueprints_usage/enumvalue:NOT_APPLICABLE"> | 21 | for planning or documentation. |
| 123 | 22 | <strong><tal:project replace="view/context/displayname" /> does not track | 22 | </p> |
| 124 | 23 | specifications.</strong> | 23 | <p tal:condition="blueprints_usage/enumvalue:NOT_APPLICABLE"> |
| 125 | 24 | </div> | 24 | <tal:project replace="view/context/displayname" /> does not track |
| 126 | 25 | 25 | use feature planning or documentation. | |
| 127 | 26 | <div tal:condition="view/context/blueprints_usage/enumvalue:UNKNOWN"> | 26 | </p> |
| 128 | 27 | <strong> | 27 | <p tal:condition="blueprints_usage/enumvalue:UNKNOWN"> |
| 129 | 28 | Launchpad does not know how | 28 | Launchpad does not know how |
| 130 | 29 | <tal:project replace="view/context/displayname" /> uses specifications. | 29 | <tal:project replace="view/context/displayname" /> tracks feature |
| 131 | 30 | </strong> | 30 | planning or documentation. |
| 132 | 31 | </div> | 31 | </p> |
| 133 | 32 | 32 | </strong> | |
| 134 | 33 | <div tal:condition="view/context/wikiurl"> | 33 | |
| 135 | 34 | <p><tal:project replace="view/context/displayname" /> has a wiki, which | 34 | <p id="wiki-fallback" |
| 136 | 35 | may be used for specifications.</p> | 35 | tal:define="wiki view/context/wikiurl" |
| 137 | 36 | 36 | tal:condition="wiki"> | |
| 138 | 37 | <p> | 37 | <tal:project replace="view/context/displayname" /> has a wiki, which |
| 139 | 38 | may be used for feature plannning and documentation.<br /> | ||
| 140 | 38 | <a tal:attributes="href view/context/wikiurl"> | 39 | <a tal:attributes="href view/context/wikiurl"> |
| 142 | 39 | <tal:project replace="view/context/displayname" /> wiki | 40 | <tal:project replace="view/context/displayname" /> wiki |
| 143 | 40 | </a> | 41 | </a> |
| 144 | 41 | </p> | 42 | </p> |
| 145 | 42 | |||
| 146 | 43 | </div> | 43 | </div> |
| 160 | 44 | <ul class="horizontal"> | 44 | |
| 161 | 45 | <li> | 45 | <p id="configure-support" |
| 162 | 46 | <a class="info sprite" | 46 | tal:condition="view/can_configure_blueprints"> |
| 163 | 47 | href="https://help.launchpad.net/BlueprintDocumentation"> | 47 | Launchpad Blueprints allow your project to track feature planning and |
| 164 | 48 | Read more about tracking blueprints | 48 | documentation.<br /> |
| 165 | 49 | </a> | 49 | <a class="info sprite" |
| 166 | 50 | </li> | 50 | href="https://help.launchpad.net/BlueprintDocumentation"> |
| 167 | 51 | </ul> | 51 | Read more about tracking feature planning with blueprints</a><br /> |
| 168 | 52 | <ul class="horiztonal"> | 52 | <a tal:replace="structure context/menu:overview/configure_blueprints/fmt:link" /><br /> |
| 169 | 53 | <li> | 53 | </p> |
| 170 | 54 | <a tal:replace="structure context/menu:overview/configure_blueprints/fmt:link" /> | 54 | </div> |
| 158 | 55 | </li> | ||
| 159 | 56 | </ul> | ||
| 171 | 57 | </div> | 55 | </div> |
| 172 | 58 | </body> | 56 | </body> |
| 173 | 59 | </html> | 57 | </html> |
| j.c.sackett (jcsackett) wrote : | # |
> My other concern is about what has specifications--a SpecificationTa
> reviewed the bugs branch a few days ago and saw only IProduct was supports
> well.
Valid; I've done some digging and have some explanations below.
> A BugTarget may be a product, projectgroup, distribution, and
> distributionsou
> everyone needs to visit an example of each to ensure the message is correct
> and the actions that can be takes are presented. eg, a project group's use of
> an app is implicit in the settings of its products.
So, I think products are now handled right.
Project groups are tricky--right now I have it defaulting to the old style, so that any blueprints made for any project will be shown. Given how the earlier question of whether or not to continue showing blueprints if has_any_
Distributions were mostly handled right; the issue with say, Kubuntu was the configure_
DSPs aren't valid for blueprints; it's always NOT_APPLICABLE and the links are all disabled. You can't even get to it by going to blueprints.
Attached is a diff of this round of changes.
| 1 | === modified file 'lib/lp/blueprints/browser/specificationtarget.py' | |||
| 2 | --- lib/lp/blueprints/browser/specificationtarget.py 2010-09-14 15:50:16 +0000 | |||
| 3 | +++ lib/lp/blueprints/browser/specificationtarget.py 2010-09-14 19:02:37 +0000 | |||
| 4 | @@ -138,6 +138,7 @@ | |||
| 5 | 138 | is_project = False | 138 | is_project = False |
| 6 | 139 | is_series = False | 139 | is_series = False |
| 7 | 140 | is_sprint = False | 140 | is_sprint = False |
| 8 | 141 | has_wiki = False | ||
| 9 | 141 | has_drivers = False | 142 | has_drivers = False |
| 10 | 142 | 143 | ||
| 11 | 143 | # Templates for the various conditions of blueprints: | 144 | # Templates for the various conditions of blueprints: |
| 12 | @@ -153,9 +154,9 @@ | |||
| 13 | 153 | @property | 154 | @property |
| 14 | 154 | def template(self): | 155 | def template(self): |
| 15 | 155 | # Check for the magical "index" added by the browser:page template | 156 | # Check for the magical "index" added by the browser:page template |
| 17 | 156 | # machinery. If it exists this is actually the | 157 | # machinery. If it exists this is actually the |
| 18 | 157 | # zope.app.pagetemplate.simpleviewclass.simple class that is magically | 158 | # zope.app.pagetemplate.simpleviewclass.simple class that is magically |
| 20 | 158 | # mixed in by the browser:page zcml directive the template defined in | 159 | # mixed in by the browser:page zcml directive the template defined in |
| 21 | 159 | # the directive should be used. | 160 | # the directive should be used. |
| 22 | 160 | if safe_hasattr(self, 'index'): | 161 | if safe_hasattr(self, 'index'): |
| 23 | 161 | return super(HasSpecificationsView, self).template | 162 | return super(HasSpecificationsView, self).template |
| 24 | @@ -167,11 +168,15 @@ | |||
| 25 | 167 | return self.default_template | 168 | return self.default_template |
| 26 | 168 | 169 | ||
| 27 | 169 | # ProjectGroups are a special case, as their products may be a | 170 | # ProjectGroups are a special case, as their products may be a |
| 31 | 170 | # combination of usage settings. Use the default, since it handles | 171 | # combination of usage settings. To deal with this, check all |
| 32 | 171 | # fetching anything that's set for ProjectGroups, and it's not correct | 172 | # products, and if a product has LAUNCHPAD for the enum, the |
| 33 | 172 | # to say anything about the ProjectGroup's usage. | 173 | # group does; if not, assume external. |
| 34 | 173 | if IProjectGroup.providedBy(self.context): | 174 | if IProjectGroup.providedBy(self.context): |
| 36 | 174 | return self.default_template | 175 | for product in self.context.products: |
| 37 | 176 | if service_uses_launchpad(product.blueprints_usage): | ||
| 38 | 177 | return self.default_template | ||
| 39 | 178 | else: | ||
| 40 | 179 | return self.not_launchpad_template | ||
| 41 | 175 | 180 | ||
| 42 | 176 | # Otherwise, determine usage and provide the correct template. | 181 | # Otherwise, determine usage and provide the correct template. |
| 43 | 177 | service_usage = IServiceUsage(self.context) | 182 | service_usage = IServiceUsage(self.context) |
| 44 | @@ -188,14 +193,19 @@ | |||
| 45 | 188 | def initialize(self): | 193 | def initialize(self): |
| 46 | 189 | if IPerson.providedBy(self.context): | 194 | if IPerson.providedBy(self.context): |
| 47 | 190 | self.is_person = True | 195 | self.is_person = True |
| 52 | 191 | elif (IDistribution.providedBy(self.context) or | 196 | elif IDistribution.providedBy(self.context): |
| 53 | 192 | IProduct.providedBy(self.context)): | 197 | self.is_target = True |
| 54 | 193 | self.is_target = True | 198 | self.is_pillar = True |
| 55 | 194 | self.is_pillar = True | 199 | self.show_series = True |
| 56 | 200 | elif IProduct.providedBy(self.context): | ||
| 57 | 201 | self.is_target = True | ||
| 58 | 202 | self.is_pillar = True | ||
| 59 | 203 | self.has_wiki = True | ||
| 60 | 195 | self.show_series = True | 204 | self.show_series = True |
| 61 | 196 | elif IProjectGroup.providedBy(self.context): | 205 | elif IProjectGroup.providedBy(self.context): |
| 62 | 197 | self.is_project = True | 206 | self.is_project = True |
| 63 | 198 | self.is_pillar = True | 207 | self.is_pillar = True |
| 64 | 208 | self.has_wiki = True | ||
| 65 | 199 | self.show_target = True | 209 | self.show_target = True |
| 66 | 200 | self.show_series = True | 210 | self.show_series = True |
| 67 | 201 | elif IProjectGroupSeries.providedBy(self.context): | 211 | elif IProjectGroupSeries.providedBy(self.context): |
| 68 | @@ -221,7 +231,8 @@ | |||
| 69 | 221 | 231 | ||
| 70 | 222 | @property | 232 | @property |
| 71 | 223 | def can_configure_blueprints(self): | 233 | def can_configure_blueprints(self): |
| 73 | 224 | """Can the user configure blueprints for the `ISpecificationTarget`.""" | 234 | """Can the user configure blueprints for the `ISpecificationTarget`. |
| 74 | 235 | """ | ||
| 75 | 225 | target = self.context | 236 | target = self.context |
| 76 | 226 | if IProduct.providedBy(target) or IDistribution.providedBy(target): | 237 | if IProduct.providedBy(target) or IDistribution.providedBy(target): |
| 77 | 227 | return check_permission('launchpad.Edit', self.context) | 238 | return check_permission('launchpad.Edit', self.context) |
| 78 | 228 | 239 | ||
| 79 | === modified file 'lib/lp/blueprints/browser/tests/test_specificationtarget.py' | |||
| 80 | --- lib/lp/blueprints/browser/tests/test_specificationtarget.py 2010-09-14 15:50:16 +0000 | |||
| 81 | +++ lib/lp/blueprints/browser/tests/test_specificationtarget.py 2010-09-14 19:01:23 +0000 | |||
| 82 | @@ -13,6 +13,7 @@ | |||
| 83 | 13 | ISpecificationTarget, | 13 | ISpecificationTarget, |
| 84 | 14 | ) | 14 | ) |
| 85 | 15 | from lp.app.enums import ServiceUsage | 15 | from lp.app.enums import ServiceUsage |
| 86 | 16 | from lp.blueprints.browser.specificationtarget import HasSpecificationsView | ||
| 87 | 16 | from lp.blueprints.publisher import BlueprintsLayer | 17 | from lp.blueprints.publisher import BlueprintsLayer |
| 88 | 17 | from lp.testing import ( | 18 | from lp.testing import ( |
| 89 | 18 | login_person, | 19 | login_person, |
| 90 | @@ -103,53 +104,65 @@ | |||
| 91 | 103 | def setUp(self): | 104 | def setUp(self): |
| 92 | 104 | super(TestHasSpecificationsTemplates, self).setUp() | 105 | super(TestHasSpecificationsTemplates, self).setUp() |
| 93 | 105 | self.user = self.factory.makePerson() | 106 | self.user = self.factory.makePerson() |
| 94 | 106 | self.product = self.factory.makeProduct() | ||
| 95 | 107 | self.naked_product = removeSecurityProxy(self.product) | ||
| 96 | 108 | login_person(self.user) | 107 | login_person(self.user) |
| 97 | 109 | 108 | ||
| 141 | 110 | def test_not_configured(self): | 109 | def _test_templates_for_configuration(self, target, context=None): |
| 142 | 111 | self.naked_product.blueprints_usage = ServiceUsage.UNKNOWN | 110 | if context is None: |
| 143 | 112 | view = create_view( | 111 | context = target |
| 144 | 113 | self.product, | 112 | naked_target = removeSecurityProxy(target) |
| 145 | 114 | '+specs', | 113 | test_configurations = [ |
| 146 | 115 | layer=BlueprintsLayer, | 114 | ServiceUsage.UNKNOWN, |
| 147 | 116 | principal=self.user) | 115 | ServiceUsage.EXTERNAL, |
| 148 | 117 | self.assertEqual( | 116 | ServiceUsage.NOT_APPLICABLE, |
| 149 | 118 | view.not_launchpad_template.filename, | 117 | ServiceUsage.LAUNCHPAD, |
| 150 | 119 | view.template.filename) | 118 | ] |
| 151 | 120 | 119 | correct_templates = [ | |
| 152 | 121 | def test_external(self): | 120 | HasSpecificationsView.not_launchpad_template.filename, |
| 153 | 122 | self.naked_product.blueprints_usage = ServiceUsage.EXTERNAL | 121 | HasSpecificationsView.not_launchpad_template.filename, |
| 154 | 123 | view = create_view( | 122 | HasSpecificationsView.not_launchpad_template.filename, |
| 155 | 124 | self.product, | 123 | HasSpecificationsView.default_template.filename, |
| 156 | 125 | '+specs', | 124 | ] |
| 157 | 126 | layer=BlueprintsLayer, | 125 | used_templates = list() |
| 158 | 127 | principal=self.user) | 126 | for config in test_configurations: |
| 159 | 128 | self.assertEqual( | 127 | naked_target.blueprints_usage = config |
| 160 | 129 | view.not_launchpad_template.filename, | 128 | view = create_view( |
| 161 | 130 | view.template.filename) | 129 | context, |
| 162 | 131 | 130 | '+specs', | |
| 163 | 132 | def test_not_applicable(self): | 131 | layer=BlueprintsLayer, |
| 164 | 133 | self.naked_product.blueprints_usage = ServiceUsage.NOT_APPLICABLE | 132 | principal=self.user) |
| 165 | 134 | view = create_view( | 133 | used_templates.append(view.template.filename) |
| 166 | 135 | self.product, | 134 | self.assertEqual(correct_templates, used_templates) |
| 167 | 136 | '+specs', | 135 | |
| 168 | 137 | layer=BlueprintsLayer, | 136 | def test_product(self): |
| 169 | 138 | principal=self.user) | 137 | product = self.factory.makeProduct() |
| 170 | 139 | self.assertEqual( | 138 | self._test_templates_for_configuration(product) |
| 171 | 140 | view.not_launchpad_template.filename, | 139 | |
| 172 | 141 | view.template.filename) | 140 | def test_product_series(self): |
| 173 | 142 | 141 | product = self.factory.makeProduct() | |
| 174 | 143 | def test_on_launchpad(self): | 142 | product_series = self.factory.makeProductSeries(product=product) |
| 175 | 144 | self.naked_product.blueprints_usage = ServiceUsage.LAUNCHPAD | 143 | self._test_templates_for_configuration( |
| 176 | 145 | view = create_view( | 144 | target=product, |
| 177 | 146 | self.product, | 145 | context=product_series) |
| 178 | 147 | '+specs', | 146 | |
| 179 | 148 | layer=BlueprintsLayer, | 147 | def test_distribution(self): |
| 180 | 149 | principal=self.user) | 148 | distribution = self.factory.makeDistribution() |
| 181 | 150 | self.assertEqual( | 149 | self._test_templates_for_configuration(distribution) |
| 182 | 151 | view.default_template.filename, | 150 | |
| 183 | 152 | view.template.filename) | 151 | def test_distroseries(self): |
| 184 | 152 | distribution = self.factory.makeDistribution() | ||
| 185 | 153 | distro_series = self.factory.makeDistroSeries( | ||
| 186 | 154 | distribution=distribution) | ||
| 187 | 155 | self._test_templates_for_configuration( | ||
| 188 | 156 | target=distribution, | ||
| 189 | 157 | context=distro_series) | ||
| 190 | 158 | |||
| 191 | 159 | def test_projectgroup(self): | ||
| 192 | 160 | project = self.factory.makeProject() | ||
| 193 | 161 | product1 = self.factory.makeProduct(project=project) | ||
| 194 | 162 | product2 = self.factory.makeProduct(project=project) | ||
| 195 | 163 | self._test_templates_for_configuration( | ||
| 196 | 164 | target=product1, | ||
| 197 | 165 | context=project) | ||
| 198 | 153 | 166 | ||
| 199 | 154 | 167 | ||
| 200 | 155 | class TestHasSpecificationsConfiguration(TestCaseWithFactory): | 168 | class TestHasSpecificationsConfiguration(TestCaseWithFactory): |
| 201 | @@ -167,7 +180,7 @@ | |||
| 202 | 167 | view = create_initialized_view(product, '+specs') | 180 | view = create_initialized_view(product, '+specs') |
| 203 | 168 | self.assertEqual(True, view.can_configure_blueprints) | 181 | self.assertEqual(True, view.can_configure_blueprints) |
| 204 | 169 | 182 | ||
| 206 | 170 | def test_cannot_configure_blueprints_distribution_no_edit_permission(self): | 183 | def test_cant_configure_blueprints_distribution_no_edit_permission(self): |
| 207 | 171 | distribution = self.factory.makeDistribution() | 184 | distribution = self.factory.makeDistribution() |
| 208 | 172 | view = create_initialized_view(distribution, '+specs') | 185 | view = create_initialized_view(distribution, '+specs') |
| 209 | 173 | self.assertEqual(False, view.can_configure_blueprints) | 186 | self.assertEqual(False, view.can_configure_blueprints) |
| 210 | @@ -178,12 +191,13 @@ | |||
| 211 | 178 | view = create_initialized_view(distribution, '+specs') | 191 | view = create_initialized_view(distribution, '+specs') |
| 212 | 179 | self.assertEqual(True, view.can_configure_blueprints) | 192 | self.assertEqual(True, view.can_configure_blueprints) |
| 213 | 180 | 193 | ||
| 215 | 181 | def test_cannot_configure_blueprints_projectgroup_with_edit_permission(self): | 194 | def test_cannot_configure_blueprints_projectgroup(self): |
| 216 | 182 | project_group = self.factory.makeProject() | 195 | project_group = self.factory.makeProject() |
| 217 | 183 | login_person(project_group.owner) | 196 | login_person(project_group.owner) |
| 218 | 184 | view = create_initialized_view(project_group, '+specs') | 197 | view = create_initialized_view(project_group, '+specs') |
| 219 | 185 | self.assertEqual(False, view.can_configure_blueprints) | 198 | self.assertEqual(False, view.can_configure_blueprints) |
| 220 | 186 | 199 | ||
| 221 | 200 | |||
| 222 | 187 | def test_suite(): | 201 | def test_suite(): |
| 223 | 188 | suite = unittest.TestSuite() | 202 | suite = unittest.TestSuite() |
| 224 | 189 | suite.addTest(unittest.TestLoader().loadTestsFromName(__name__)) | 203 | suite.addTest(unittest.TestLoader().loadTestsFromName(__name__)) |
| 225 | 190 | 204 | ||
| 226 | === modified file 'lib/lp/blueprints/templates/unknown-specs.pt' | |||
| 227 | --- lib/lp/blueprints/templates/unknown-specs.pt 2010-09-14 16:03:51 +0000 | |||
| 228 | +++ lib/lp/blueprints/templates/unknown-specs.pt 2010-09-14 19:07:36 +0000 | |||
| 229 | @@ -9,29 +9,38 @@ | |||
| 230 | 9 | 9 | ||
| 231 | 10 | <body> | 10 | <body> |
| 232 | 11 | 11 | ||
| 237 | 12 | <div metal:fill-slot="main" | 12 | <div metal:fill-slot="main"> |
| 234 | 13 | tal:define="specs view/specs; | ||
| 235 | 14 | has_any_specs view/has_any_specifications; | ||
| 236 | 15 | blueprints_usage view/context/blueprints_usage"> | ||
| 238 | 16 | <div class="top-portlet"> | 13 | <div class="top-portlet"> |
| 239 | 17 | <div id="specs-unknown"> | 14 | <div id="specs-unknown"> |
| 240 | 18 | <strong> | 15 | <strong> |
| 254 | 19 | <p tal:condition="blueprints_usage/enumvalue:EXTERNAL"> | 16 | <div tal:omit-tag tal:condition="view/is_project"> |
| 255 | 20 | <tal:project replace="view/context/displayname" /> does not use Launchpad | 17 | <p> |
| 256 | 21 | for planning or documentation. | 18 | Launchpad does not know how |
| 257 | 22 | </p> | 19 | <tal:project replace="view/context/displayname" /> tracks feature |
| 258 | 23 | <p tal:condition="blueprints_usage/enumvalue:NOT_APPLICABLE"> | 20 | planning or documentation. |
| 259 | 24 | <tal:project replace="view/context/displayname" /> does not track | 21 | </p> |
| 260 | 25 | use feature planning or documentation. | 22 | </div> |
| 261 | 26 | </p> | 23 | <div tal:omit-tag tal:condition="not:view/is_project"> |
| 262 | 27 | <p tal:condition="blueprints_usage/enumvalue:UNKNOWN"> | 24 | <div tal:omit-tag tal:define="blueprints_usage view/context/blueprints_usage"> |
| 263 | 28 | Launchpad does not know how | 25 | <p tal:condition="blueprints_usage/enumvalue:EXTERNAL"> |
| 264 | 29 | <tal:project replace="view/context/displayname" /> tracks feature | 26 | <tal:project replace="view/context/displayname" /> does not use Launchpad |
| 265 | 30 | planning or documentation. | 27 | for planning or documentation. |
| 266 | 31 | </p> | 28 | </p> |
| 267 | 29 | <p tal:condition="blueprints_usage/enumvalue:NOT_APPLICABLE"> | ||
| 268 | 30 | <tal:project replace="view/context/displayname" /> does not track | ||
| 269 | 31 | use feature planning or documentation. | ||
| 270 | 32 | </p> | ||
| 271 | 33 | <p tal:condition="blueprints_usage/enumvalue:UNKNOWN"> | ||
| 272 | 34 | Launchpad does not know how | ||
| 273 | 35 | <tal:project replace="view/context/displayname" /> tracks feature | ||
| 274 | 36 | planning or documentation. | ||
| 275 | 37 | </p> | ||
| 276 | 38 | </div> | ||
| 277 | 39 | </div> | ||
| 278 | 32 | </strong> | 40 | </strong> |
| 279 | 33 | 41 | ||
| 281 | 34 | <p id="wiki-fallback" | 42 | <div tal:omit-tag tal:condition="view/has_wiki"> |
| 282 | 43 | <p id="wiki-fallback" | ||
| 283 | 35 | tal:define="wiki view/context/wikiurl" | 44 | tal:define="wiki view/context/wikiurl" |
| 284 | 36 | tal:condition="wiki"> | 45 | tal:condition="wiki"> |
| 285 | 37 | <tal:project replace="view/context/displayname" /> has a wiki, which | 46 | <tal:project replace="view/context/displayname" /> has a wiki, which |
| 286 | @@ -40,8 +49,9 @@ | |||
| 287 | 40 | <tal:project replace="view/context/displayname" /> wiki | 49 | <tal:project replace="view/context/displayname" /> wiki |
| 288 | 41 | </a> | 50 | </a> |
| 289 | 42 | </p> | 51 | </p> |
| 290 | 52 | </div> | ||
| 291 | 43 | </div> | 53 | </div> |
| 293 | 44 | 54 | ||
| 294 | 45 | <p id="configure-support" | 55 | <p id="configure-support" |
| 295 | 46 | tal:condition="view/can_configure_blueprints"> | 56 | tal:condition="view/can_configure_blueprints"> |
| 296 | 47 | Launchpad Blueprints allow your project to track feature planning and | 57 | Launchpad Blueprints allow your project to track feature planning and |
| 297 | 48 | 58 | ||
| 298 | === modified file 'lib/lp/registry/browser/distribution.py' | |||
| 299 | --- lib/lp/registry/browser/distribution.py 2010-09-13 12:09:30 +0000 | |||
| 300 | +++ lib/lp/registry/browser/distribution.py 2010-09-14 19:01:42 +0000 | |||
| 301 | @@ -342,6 +342,7 @@ | |||
| 302 | 342 | 'announcements', | 342 | 'announcements', |
| 303 | 343 | 'ppas', | 343 | 'ppas', |
| 304 | 344 | 'configure_answers', | 344 | 'configure_answers', |
| 305 | 345 | 'configure_blueprints', | ||
| 306 | 345 | ] | 346 | ] |
| 307 | 346 | 347 | ||
| 308 | 347 | @enabled_with_permission('launchpad.Edit') | 348 | @enabled_with_permission('launchpad.Edit') |
| 309 | @@ -453,6 +454,12 @@ | |||
| 310 | 453 | summary = 'Allow users to ask questions on this project' | 454 | summary = 'Allow users to ask questions on this project' |
| 311 | 454 | return Link('+edit', text, summary, icon='edit') | 455 | return Link('+edit', text, summary, icon='edit') |
| 312 | 455 | 456 | ||
| 313 | 457 | @enabled_with_permission('launchpad.Edit') | ||
| 314 | 458 | def configure_blueprints(self): | ||
| 315 | 459 | text = 'Configure blueprints' | ||
| 316 | 460 | summary = 'Enable tracking of specifications and meetings' | ||
| 317 | 461 | return Link('+edit', text, summary, icon='edit') | ||
| 318 | 462 | |||
| 319 | 456 | 463 | ||
| 320 | 457 | class DerivativeDistributionOverviewMenu(DistributionOverviewMenu): | 464 | class DerivativeDistributionOverviewMenu(DistributionOverviewMenu): |
| 321 | 458 | 465 | ||
| Curtis Hovey (sinzui) wrote : | # |
On Tue, 2010-09-14 at 19:16 +0000, j.c.sackett wrote:
> Project groups are tricky--right now I have it defaulting to the old
> style, so that any blueprints made for any project will be shown.
> Given how the earlier question of whether or not to continue showing
> blueprints if has_any_
> appropriate to only turn this on if at least one product has LAUNCHPAD
> as its usage setting.
I do not this this rule is right. PillarView that renders the
Involvement Portlet and the "Register a Blueprint" link only shows the
link on a project group if a sub project has enabled it. The involvement
portlet is controlled by the pillar owners and its links are enabled to
attack contributors to the applications the pillar uses.
We do not want the Involvement portlet to contradict the app page, which
is the reason we need to disable apps for unknown, not applicable, and
external (most of the time). Answers uses the involvement portlet to
decide the state to ensure it never contradicts. I expect all the apps
do do something similar so that we have a DRY implementation.
involvement = getMultiAdapter(
if service_
# enable the listing.
--
__Curtis C. Hovey_________
http://
| j.c.sackett (jcsackett) wrote : | # |
I like the multiAdapter strategy you showed and have put it in place of the for loop.
| Guilherme Salgado (salgado) wrote : | # |
Hi Jon,
This looks good, and I only have a couple suggestions.
s/use// @ "[...] does not track use feature planning or documentation."
And for bonus points you could change the 'Configure blueprints' text according to the state the context is in. For example, in the UNKNOWN state, it could be changed to "Tell us how <project> tracks feature planning and documentation". Similarly, for the EXTERNAL (and maybe NOT_APPLICABLE as well?) state, it could be "Use Launchpad to track feature planning and documentation", although that's a bit of a lie as there are other things you can do by following that link (but then it should be a worthy tradeoff if our goal is to get people to use blueprints).
| Curtis Hovey (sinzui) wrote : | # |
I think this is good to land, with the fixing of some link test. I suspect there are some other issues we will see when this feature is used with real data.
Thanks Salgado for seeing the problem in the enums. I see a similar issue with this link test: 'Enable tracking of specifications and meetings'. meetings, AKA sprints do not belong to projects or teams. They are always available because they are a cross-project/
| Curtis Hovey (sinzui) wrote : | # |
Doh. My comment was intended to be UI approve.
Preview Diff
| 1 | === modified file 'lib/lp/blueprints/browser/configure.zcml' | |||
| 2 | --- lib/lp/blueprints/browser/configure.zcml 2010-07-27 17:17:59 +0000 | |||
| 3 | +++ lib/lp/blueprints/browser/configure.zcml 2010-09-17 14:23:57 +0000 | |||
| 4 | @@ -53,8 +53,7 @@ | |||
| 5 | 53 | name="+mdz-specs.csv" | 53 | name="+mdz-specs.csv" |
| 6 | 54 | attribute="mdzCsv"/> | 54 | attribute="mdzCsv"/> |
| 7 | 55 | <browser:page | 55 | <browser:page |
| 10 | 56 | name="+specs" | 56 | name="+specs"/> |
| 9 | 57 | template="../templates/hasspecifications-specs.pt"/> | ||
| 11 | 58 | <browser:page | 57 | <browser:page |
| 12 | 59 | name="+portlet-latestspecs" | 58 | name="+portlet-latestspecs" |
| 13 | 60 | template="../templates/specificationtarget-portlet-latestspecs.pt"/> | 59 | template="../templates/specificationtarget-portlet-latestspecs.pt"/> |
| 14 | @@ -500,8 +499,7 @@ | |||
| 15 | 500 | class="lp.blueprints.browser.specificationtarget.HasSpecificationsView" | 499 | class="lp.blueprints.browser.specificationtarget.HasSpecificationsView" |
| 16 | 501 | permission="zope.Public"> | 500 | permission="zope.Public"> |
| 17 | 502 | <browser:page | 501 | <browser:page |
| 20 | 503 | name="+specs" | 502 | name="+specs"/> |
| 19 | 504 | template="../templates/hasspecifications-specs.pt"/> | ||
| 21 | 505 | </browser:pages> | 503 | </browser:pages> |
| 22 | 506 | <browser:page | 504 | <browser:page |
| 23 | 507 | for="lp.blueprints.interfaces.specificationtarget.ISpecificationGoal" | 505 | for="lp.blueprints.interfaces.specificationtarget.ISpecificationGoal" |
| 24 | @@ -532,8 +530,7 @@ | |||
| 25 | 532 | class="lp.blueprints.browser.specificationtarget.HasSpecificationsView" | 530 | class="lp.blueprints.browser.specificationtarget.HasSpecificationsView" |
| 26 | 533 | permission="zope.Public"> | 531 | permission="zope.Public"> |
| 27 | 534 | <browser:page | 532 | <browser:page |
| 30 | 535 | name="+specs" | 533 | name="+specs"/> |
| 29 | 536 | template="../templates/hasspecifications-specs.pt"/> | ||
| 31 | 537 | <browser:page | 534 | <browser:page |
| 32 | 538 | name="+portlet-latestspecs" | 535 | name="+portlet-latestspecs" |
| 33 | 539 | template="../templates/specificationtarget-portlet-latestspecs.pt"/> | 536 | template="../templates/specificationtarget-portlet-latestspecs.pt"/> |
| 34 | @@ -583,8 +580,7 @@ | |||
| 35 | 583 | facet="specifications" | 580 | facet="specifications" |
| 36 | 584 | permission="zope.Public"> | 581 | permission="zope.Public"> |
| 37 | 585 | <browser:page | 582 | <browser:page |
| 40 | 586 | name="+specs" | 583 | name="+specs"/> |
| 39 | 587 | template="../templates/hasspecifications-specs.pt"/> | ||
| 41 | 588 | <browser:page | 584 | <browser:page |
| 42 | 589 | name="+portlet-latestspecs" | 585 | name="+portlet-latestspecs" |
| 43 | 590 | template="../templates/specificationtarget-portlet-latestspecs.pt"/> | 586 | template="../templates/specificationtarget-portlet-latestspecs.pt"/> |
| 44 | 591 | 587 | ||
| 45 | === modified file 'lib/lp/blueprints/browser/specificationtarget.py' | |||
| 46 | --- lib/lp/blueprints/browser/specificationtarget.py 2010-09-14 23:42:27 +0000 | |||
| 47 | +++ lib/lp/blueprints/browser/specificationtarget.py 2010-09-17 14:23:57 +0000 | |||
| 48 | @@ -15,7 +15,11 @@ | |||
| 49 | 15 | 15 | ||
| 50 | 16 | from operator import itemgetter | 16 | from operator import itemgetter |
| 51 | 17 | 17 | ||
| 53 | 18 | from zope.component import queryMultiAdapter | 18 | from z3c.ptcompat import ViewPageTemplateFile |
| 54 | 19 | from zope.component import ( | ||
| 55 | 20 | getMultiAdapter, | ||
| 56 | 21 | queryMultiAdapter, | ||
| 57 | 22 | ) | ||
| 58 | 19 | 23 | ||
| 59 | 20 | from canonical.config import config | 24 | from canonical.config import config |
| 60 | 21 | from canonical.launchpad import _ | 25 | from canonical.launchpad import _ |
| 61 | @@ -25,13 +29,19 @@ | |||
| 62 | 25 | canonical_url, | 29 | canonical_url, |
| 63 | 26 | LaunchpadView, | 30 | LaunchpadView, |
| 64 | 27 | ) | 31 | ) |
| 65 | 32 | from canonical.launchpad.webapp.authorization import check_permission | ||
| 66 | 28 | from canonical.launchpad.webapp.batching import BatchNavigator | 33 | from canonical.launchpad.webapp.batching import BatchNavigator |
| 67 | 29 | from canonical.launchpad.webapp.breadcrumb import Breadcrumb | 34 | from canonical.launchpad.webapp.breadcrumb import Breadcrumb |
| 68 | 30 | from canonical.launchpad.webapp.menu import ( | 35 | from canonical.launchpad.webapp.menu import ( |
| 69 | 31 | enabled_with_permission, | 36 | enabled_with_permission, |
| 70 | 32 | Link, | 37 | Link, |
| 71 | 33 | ) | 38 | ) |
| 73 | 34 | from canonical.lazr.utils import smartquote | 39 | from canonical.lazr.utils import ( |
| 74 | 40 | safe_hasattr, | ||
| 75 | 41 | smartquote, | ||
| 76 | 42 | ) | ||
| 77 | 43 | from lp.app.enums import service_uses_launchpad | ||
| 78 | 44 | from lp.app.interfaces.launchpad import IServiceUsage | ||
| 79 | 35 | from lp.blueprints.interfaces.specification import ( | 45 | from lp.blueprints.interfaces.specification import ( |
| 80 | 36 | SpecificationFilter, | 46 | SpecificationFilter, |
| 81 | 37 | SpecificationSort, | 47 | SpecificationSort, |
| 82 | @@ -131,21 +141,76 @@ | |||
| 83 | 131 | is_project = False | 141 | is_project = False |
| 84 | 132 | is_series = False | 142 | is_series = False |
| 85 | 133 | is_sprint = False | 143 | is_sprint = False |
| 86 | 144 | has_wiki = False | ||
| 87 | 134 | has_drivers = False | 145 | has_drivers = False |
| 88 | 135 | 146 | ||
| 89 | 147 | # Templates for the various conditions of blueprints: | ||
| 90 | 148 | # * On Launchpad | ||
| 91 | 149 | # * External | ||
| 92 | 150 | # * Disabled | ||
| 93 | 151 | # * Unknown | ||
| 94 | 152 | default_template = ViewPageTemplateFile( | ||
| 95 | 153 | '../templates/hasspecifications-specs.pt') | ||
| 96 | 154 | not_launchpad_template = ViewPageTemplateFile( | ||
| 97 | 155 | '../templates/unknown-specs.pt') | ||
| 98 | 156 | |||
| 99 | 157 | @property | ||
| 100 | 158 | def template(self): | ||
| 101 | 159 | # Check for the magical "index" added by the browser:page template | ||
| 102 | 160 | # machinery. If it exists this is actually the | ||
| 103 | 161 | # zope.app.pagetemplate.simpleviewclass.simple class that is magically | ||
| 104 | 162 | # mixed in by the browser:page zcml directive the template defined in | ||
| 105 | 163 | # the directive should be used. | ||
| 106 | 164 | if safe_hasattr(self, 'index'): | ||
| 107 | 165 | return super(HasSpecificationsView, self).template | ||
| 108 | 166 | |||
| 109 | 167 | # Sprints and Persons don't have a usage enum for blueprints, so we | ||
| 110 | 168 | # have to fallback to the default. | ||
| 111 | 169 | if (ISprint.providedBy(self.context) | ||
| 112 | 170 | or IPerson.providedBy(self.context)): | ||
| 113 | 171 | return self.default_template | ||
| 114 | 172 | |||
| 115 | 173 | # ProjectGroups are a special case, as their products may be a | ||
| 116 | 174 | # combination of usage settings. To deal with this, check all | ||
| 117 | 175 | # products via the involvment menu. | ||
| 118 | 176 | if (IProjectGroup.providedBy(self.context) | ||
| 119 | 177 | or IProjectGroupSeries.providedBy(self.context)): | ||
| 120 | 178 | involvement = getMultiAdapter( | ||
| 121 | 179 | (self.context, self.request), | ||
| 122 | 180 | name='+get-involved') | ||
| 123 | 181 | if service_uses_launchpad(involvement.blueprints_usage): | ||
| 124 | 182 | return self.default_template | ||
| 125 | 183 | else: | ||
| 126 | 184 | return self.not_launchpad_template | ||
| 127 | 185 | |||
| 128 | 186 | # Otherwise, determine usage and provide the correct template. | ||
| 129 | 187 | service_usage = IServiceUsage(self.context) | ||
| 130 | 188 | if service_uses_launchpad(service_usage.blueprints_usage): | ||
| 131 | 189 | return self.default_template | ||
| 132 | 190 | else: | ||
| 133 | 191 | return self.not_launchpad_template | ||
| 134 | 192 | |||
| 135 | 193 | def render(self): | ||
| 136 | 194 | return self.template() | ||
| 137 | 195 | |||
| 138 | 136 | # XXX: jsk: 2007-07-12 bug=173972: This method might be improved by | 196 | # XXX: jsk: 2007-07-12 bug=173972: This method might be improved by |
| 139 | 137 | # replacing the conditional execution with polymorphism. | 197 | # replacing the conditional execution with polymorphism. |
| 140 | 138 | def initialize(self): | 198 | def initialize(self): |
| 141 | 139 | if IPerson.providedBy(self.context): | 199 | if IPerson.providedBy(self.context): |
| 142 | 140 | self.is_person = True | 200 | self.is_person = True |
| 147 | 141 | elif (IDistribution.providedBy(self.context) or | 201 | elif IDistribution.providedBy(self.context): |
| 148 | 142 | IProduct.providedBy(self.context)): | 202 | self.is_target = True |
| 149 | 143 | self.is_target = True | 203 | self.is_pillar = True |
| 150 | 144 | self.is_pillar = True | 204 | self.show_series = True |
| 151 | 205 | elif IProduct.providedBy(self.context): | ||
| 152 | 206 | self.is_target = True | ||
| 153 | 207 | self.is_pillar = True | ||
| 154 | 208 | self.has_wiki = True | ||
| 155 | 145 | self.show_series = True | 209 | self.show_series = True |
| 156 | 146 | elif IProjectGroup.providedBy(self.context): | 210 | elif IProjectGroup.providedBy(self.context): |
| 157 | 147 | self.is_project = True | 211 | self.is_project = True |
| 158 | 148 | self.is_pillar = True | 212 | self.is_pillar = True |
| 159 | 213 | self.has_wiki = True | ||
| 160 | 149 | self.show_target = True | 214 | self.show_target = True |
| 161 | 150 | self.show_series = True | 215 | self.show_series = True |
| 162 | 151 | elif IProjectGroupSeries.providedBy(self.context): | 216 | elif IProjectGroupSeries.providedBy(self.context): |
| 163 | @@ -170,6 +235,16 @@ | |||
| 164 | 170 | size=config.launchpad.default_batch_size) | 235 | size=config.launchpad.default_batch_size) |
| 165 | 171 | 236 | ||
| 166 | 172 | @property | 237 | @property |
| 167 | 238 | def can_configure_blueprints(self): | ||
| 168 | 239 | """Can the user configure blueprints for the `ISpecificationTarget`. | ||
| 169 | 240 | """ | ||
| 170 | 241 | target = self.context | ||
| 171 | 242 | if IProduct.providedBy(target) or IDistribution.providedBy(target): | ||
| 172 | 243 | return check_permission('launchpad.Edit', self.context) | ||
| 173 | 244 | else: | ||
| 174 | 245 | return False | ||
| 175 | 246 | |||
| 176 | 247 | @property | ||
| 177 | 173 | def label(self): | 248 | def label(self): |
| 178 | 174 | mapping = {'name': self.context.displayname} | 249 | mapping = {'name': self.context.displayname} |
| 179 | 175 | if self.is_person: | 250 | if self.is_person: |
| 180 | @@ -199,7 +274,7 @@ | |||
| 181 | 199 | 'distroseries', | 274 | 'distroseries', |
| 182 | 200 | 'direction_approved', | 275 | 'direction_approved', |
| 183 | 201 | 'man_days', | 276 | 'man_days', |
| 185 | 202 | 'delivery' | 277 | 'delivery', |
| 186 | 203 | ] | 278 | ] |
| 187 | 204 | def dbschema(item): | 279 | def dbschema(item): |
| 188 | 205 | """Format a dbschema sortably for a spreadsheet.""" | 280 | """Format a dbschema sortably for a spreadsheet.""" |
| 189 | 206 | 281 | ||
| 190 | === modified file 'lib/lp/blueprints/browser/tests/test_specificationtarget.py' | |||
| 191 | --- lib/lp/blueprints/browser/tests/test_specificationtarget.py 2010-09-15 00:07:54 +0000 | |||
| 192 | +++ lib/lp/blueprints/browser/tests/test_specificationtarget.py 2010-09-17 14:23:57 +0000 | |||
| 193 | @@ -1,8 +1,12 @@ | |||
| 195 | 1 | # Copyright 2009 Canonical Ltd. This software is licensed under the | 1 | # Copyright 2009-2010 Canonical Ltd. This software is licensed under the |
| 196 | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). | 2 | # GNU Affero General Public License version 3 (see the file LICENSE). |
| 197 | 3 | 3 | ||
| 198 | 4 | __metaclass__ = type | 4 | __metaclass__ = type |
| 199 | 5 | 5 | ||
| 200 | 6 | import unittest | ||
| 201 | 7 | |||
| 202 | 8 | from zope.security.proxy import removeSecurityProxy | ||
| 203 | 9 | |||
| 204 | 6 | from canonical.launchpad.webapp.batching import BatchNavigator | 10 | from canonical.launchpad.webapp.batching import BatchNavigator |
| 205 | 7 | from canonical.launchpad.testing.pages import find_tag_by_id | 11 | from canonical.launchpad.testing.pages import find_tag_by_id |
| 206 | 8 | from canonical.testing.layers import DatabaseFunctionalLayer | 12 | from canonical.testing.layers import DatabaseFunctionalLayer |
| 207 | @@ -10,6 +14,8 @@ | |||
| 208 | 10 | IHasSpecifications, | 14 | IHasSpecifications, |
| 209 | 11 | ISpecificationTarget, | 15 | ISpecificationTarget, |
| 210 | 12 | ) | 16 | ) |
| 211 | 17 | from lp.app.enums import ServiceUsage | ||
| 212 | 18 | from lp.blueprints.browser.specificationtarget import HasSpecificationsView | ||
| 213 | 13 | from lp.blueprints.publisher import BlueprintsLayer | 19 | from lp.blueprints.publisher import BlueprintsLayer |
| 214 | 14 | from lp.testing import ( | 20 | from lp.testing import ( |
| 215 | 15 | login_person, | 21 | login_person, |
| 216 | @@ -53,7 +59,7 @@ | |||
| 217 | 53 | self.verify_view(context, 'sprints/%s' % context.name) | 59 | self.verify_view(context, 'sprints/%s' % context.name) |
| 218 | 54 | 60 | ||
| 219 | 55 | 61 | ||
| 221 | 56 | class TestHasSpecificationsView(TestCaseWithFactory): | 62 | class TestHasSpecificationsViewInvolvement(TestCaseWithFactory): |
| 222 | 57 | """Test specification menus links.""" | 63 | """Test specification menus links.""" |
| 223 | 58 | layer = DatabaseFunctionalLayer | 64 | layer = DatabaseFunctionalLayer |
| 224 | 59 | 65 | ||
| 225 | @@ -71,10 +77,17 @@ | |||
| 226 | 71 | 77 | ||
| 227 | 72 | def test_specificationtarget(self): | 78 | def test_specificationtarget(self): |
| 228 | 73 | context = self.factory.makeProduct(name='almond') | 79 | context = self.factory.makeProduct(name='almond') |
| 229 | 80 | naked_product = removeSecurityProxy(context) | ||
| 230 | 81 | naked_product.blueprints_usage = ServiceUsage.LAUNCHPAD | ||
| 231 | 74 | self.verify_involvment(context) | 82 | self.verify_involvment(context) |
| 232 | 75 | 83 | ||
| 233 | 76 | def test_adaptable_to_specificationtarget(self): | 84 | def test_adaptable_to_specificationtarget(self): |
| 234 | 85 | # A project should adapt to the products within to determine | ||
| 235 | 86 | # involvment. | ||
| 236 | 77 | context = self.factory.makeProject(name='hazelnut') | 87 | context = self.factory.makeProject(name='hazelnut') |
| 237 | 88 | product = self.factory.makeProduct(project=context) | ||
| 238 | 89 | naked_product = removeSecurityProxy(product) | ||
| 239 | 90 | naked_product.blueprints_usage = ServiceUsage.LAUNCHPAD | ||
| 240 | 78 | self.verify_involvment(context) | 91 | self.verify_involvment(context) |
| 241 | 79 | 92 | ||
| 242 | 80 | def test_sprint(self): | 93 | def test_sprint(self): |
| 243 | @@ -128,4 +141,115 @@ | |||
| 244 | 128 | find_tag_by_id(content, 'upper-batch-nav-batchnav-next')['class']) | 141 | find_tag_by_id(content, 'upper-batch-nav-batchnav-next')['class']) |
| 245 | 129 | self.assertEqual('next', | 142 | self.assertEqual('next', |
| 246 | 130 | find_tag_by_id(content, 'lower-batch-nav-batchnav-next')['class']) | 143 | find_tag_by_id(content, 'lower-batch-nav-batchnav-next')['class']) |
| 248 | 131 | 144 | ||
| 249 | 145 | |||
| 250 | 146 | class TestHasSpecificationsTemplates(TestCaseWithFactory): | ||
| 251 | 147 | """Tests the selection of templates based on blueprints usage.""" | ||
| 252 | 148 | |||
| 253 | 149 | layer = DatabaseFunctionalLayer | ||
| 254 | 150 | |||
| 255 | 151 | def setUp(self): | ||
| 256 | 152 | super(TestHasSpecificationsTemplates, self).setUp() | ||
| 257 | 153 | self.user = self.factory.makePerson() | ||
| 258 | 154 | login_person(self.user) | ||
| 259 | 155 | |||
| 260 | 156 | def _test_templates_for_configuration(self, target, context=None): | ||
| 261 | 157 | if context is None: | ||
| 262 | 158 | context = target | ||
| 263 | 159 | naked_target = removeSecurityProxy(target) | ||
| 264 | 160 | test_configurations = [ | ||
| 265 | 161 | ServiceUsage.UNKNOWN, | ||
| 266 | 162 | ServiceUsage.EXTERNAL, | ||
| 267 | 163 | ServiceUsage.NOT_APPLICABLE, | ||
| 268 | 164 | ServiceUsage.LAUNCHPAD, | ||
| 269 | 165 | ] | ||
| 270 | 166 | correct_templates = [ | ||
| 271 | 167 | HasSpecificationsView.not_launchpad_template.filename, | ||
| 272 | 168 | HasSpecificationsView.not_launchpad_template.filename, | ||
| 273 | 169 | HasSpecificationsView.not_launchpad_template.filename, | ||
| 274 | 170 | HasSpecificationsView.default_template.filename, | ||
| 275 | 171 | ] | ||
| 276 | 172 | used_templates = list() | ||
| 277 | 173 | for config in test_configurations: | ||
| 278 | 174 | naked_target.blueprints_usage = config | ||
| 279 | 175 | view = create_view( | ||
| 280 | 176 | context, | ||
| 281 | 177 | '+specs', | ||
| 282 | 178 | layer=BlueprintsLayer, | ||
| 283 | 179 | principal=self.user) | ||
| 284 | 180 | used_templates.append(view.template.filename) | ||
| 285 | 181 | self.assertEqual(correct_templates, used_templates) | ||
| 286 | 182 | |||
| 287 | 183 | def test_product(self): | ||
| 288 | 184 | product = self.factory.makeProduct() | ||
| 289 | 185 | self._test_templates_for_configuration(product) | ||
| 290 | 186 | |||
| 291 | 187 | def test_product_series(self): | ||
| 292 | 188 | product = self.factory.makeProduct() | ||
| 293 | 189 | product_series = self.factory.makeProductSeries(product=product) | ||
| 294 | 190 | self._test_templates_for_configuration( | ||
| 295 | 191 | target=product, | ||
| 296 | 192 | context=product_series) | ||
| 297 | 193 | |||
| 298 | 194 | def test_distribution(self): | ||
| 299 | 195 | distribution = self.factory.makeDistribution() | ||
| 300 | 196 | self._test_templates_for_configuration(distribution) | ||
| 301 | 197 | |||
| 302 | 198 | def test_distroseries(self): | ||
| 303 | 199 | distribution = self.factory.makeDistribution() | ||
| 304 | 200 | distro_series = self.factory.makeDistroSeries( | ||
| 305 | 201 | distribution=distribution) | ||
| 306 | 202 | self._test_templates_for_configuration( | ||
| 307 | 203 | target=distribution, | ||
| 308 | 204 | context=distro_series) | ||
| 309 | 205 | |||
| 310 | 206 | def test_projectgroup(self): | ||
| 311 | 207 | project = self.factory.makeProject() | ||
| 312 | 208 | product1 = self.factory.makeProduct(project=project) | ||
| 313 | 209 | product2 = self.factory.makeProduct(project=project) | ||
| 314 | 210 | self._test_templates_for_configuration( | ||
| 315 | 211 | target=product1, | ||
| 316 | 212 | context=project) | ||
| 317 | 213 | |||
| 318 | 214 | |||
| 319 | 215 | class TestHasSpecificationsConfiguration(TestCaseWithFactory): | ||
| 320 | 216 | |||
| 321 | 217 | layer = DatabaseFunctionalLayer | ||
| 322 | 218 | |||
| 323 | 219 | def test_cannot_configure_blueprints_product_no_edit_permission(self): | ||
| 324 | 220 | product = self.factory.makeProduct() | ||
| 325 | 221 | view = create_initialized_view(product, '+specs') | ||
| 326 | 222 | self.assertEqual(False, view.can_configure_blueprints) | ||
| 327 | 223 | |||
| 328 | 224 | def test_can_configure_blueprints_product_with_edit_permission(self): | ||
| 329 | 225 | product = self.factory.makeProduct() | ||
| 330 | 226 | login_person(product.owner) | ||
| 331 | 227 | view = create_initialized_view(product, '+specs') | ||
| 332 | 228 | self.assertEqual(True, view.can_configure_blueprints) | ||
| 333 | 229 | |||
| 334 | 230 | def test_cant_configure_blueprints_distribution_no_edit_permission(self): | ||
| 335 | 231 | distribution = self.factory.makeDistribution() | ||
| 336 | 232 | view = create_initialized_view(distribution, '+specs') | ||
| 337 | 233 | self.assertEqual(False, view.can_configure_blueprints) | ||
| 338 | 234 | |||
| 339 | 235 | def test_can_configure_blueprints_distribution_with_edit_permission(self): | ||
| 340 | 236 | distribution = self.factory.makeDistribution() | ||
| 341 | 237 | login_person(distribution.owner) | ||
| 342 | 238 | view = create_initialized_view(distribution, '+specs') | ||
| 343 | 239 | self.assertEqual(True, view.can_configure_blueprints) | ||
| 344 | 240 | |||
| 345 | 241 | def test_cannot_configure_blueprints_projectgroup(self): | ||
| 346 | 242 | project_group = self.factory.makeProject() | ||
| 347 | 243 | login_person(project_group.owner) | ||
| 348 | 244 | view = create_initialized_view(project_group, '+specs') | ||
| 349 | 245 | self.assertEqual(False, view.can_configure_blueprints) | ||
| 350 | 246 | |||
| 351 | 247 | |||
| 352 | 248 | def test_suite(): | ||
| 353 | 249 | suite = unittest.TestSuite() | ||
| 354 | 250 | suite.addTest(unittest.TestLoader().loadTestsFromName(__name__)) | ||
| 355 | 251 | return suite | ||
| 356 | 252 | |||
| 357 | 253 | |||
| 358 | 254 | if __name__ == '__main__': | ||
| 359 | 255 | unittest.TextTestRunner().run(test_suite()) | ||
| 360 | 132 | 256 | ||
| 361 | === modified file 'lib/lp/blueprints/stories/blueprints/xx-creation.txt' | |||
| 362 | --- lib/lp/blueprints/stories/blueprints/xx-creation.txt 2010-08-26 02:30:06 +0000 | |||
| 363 | +++ lib/lp/blueprints/stories/blueprints/xx-creation.txt 2010-09-17 14:23:57 +0000 | |||
| 364 | @@ -1,7 +1,26 @@ | |||
| 369 | 1 | = Creating Blueprints = | 1 | Creating Blueprints |
| 370 | 2 | 2 | =================== | |
| 371 | 3 | 3 | ||
| 372 | 4 | == Introduction == | 4 | Set Up |
| 373 | 5 | ------ | ||
| 374 | 6 | A number of tests in this need a product with blueprints enabled, so we'll | ||
| 375 | 7 | enable them on bazaar, firefox, and jokosher. | ||
| 376 | 8 | |||
| 377 | 9 | >>> from zope.component import getUtility | ||
| 378 | 10 | >>> from lp.app.enums import ServiceUsage | ||
| 379 | 11 | >>> from lp.registry.interfaces.product import IProductSet | ||
| 380 | 12 | >>> login('admin@canonical.com') | ||
| 381 | 13 | >>> bazaar = getUtility(IProductSet).getByName('bzr') | ||
| 382 | 14 | >>> bazaar.blueprints_usage = ServiceUsage.LAUNCHPAD | ||
| 383 | 15 | >>> firefox = getUtility(IProductSet).getByName('firefox') | ||
| 384 | 16 | >>> firefox.blueprints_usage = ServiceUsage.LAUNCHPAD | ||
| 385 | 17 | >>> jokosher = getUtility(IProductSet).getByName('jokosher') | ||
| 386 | 18 | >>> jokosher.blueprints_usage = ServiceUsage.LAUNCHPAD | ||
| 387 | 19 | >>> transaction.commit() | ||
| 388 | 20 | >>> logout() | ||
| 389 | 21 | |||
| 390 | 22 | Introduction | ||
| 391 | 23 | ------------ | ||
| 392 | 5 | 24 | ||
| 393 | 6 | Users can register blueprints from many locations in Launchpad. To start with, | 25 | Users can register blueprints from many locations in Launchpad. To start with, |
| 394 | 7 | it's possible to register a blueprint from the Blueprints home page. However, | 26 | it's possible to register a blueprint from the Blueprints home page. However, |
| 395 | @@ -15,7 +34,9 @@ | |||
| 396 | 15 | * a sprint | 34 | * a sprint |
| 397 | 16 | 35 | ||
| 398 | 17 | 36 | ||
| 400 | 18 | == The blueprint registration form == | 37 | The blueprint registration form |
| 401 | 38 | ------------------------------- | ||
| 402 | 39 | |||
| 403 | 19 | 40 | ||
| 404 | 20 | Launchpad provides a dedicated form page for users to register blueprints. | 41 | Launchpad provides a dedicated form page for users to register blueprints. |
| 405 | 21 | Generally speaking, users can navigate to this form from each of the supported | 42 | Generally speaking, users can navigate to this form from each of the supported |
| 406 | @@ -28,13 +49,15 @@ | |||
| 407 | 28 | we'll use extra care when its necessary to demonstrate that they both exist. | 49 | we'll use extra care when its necessary to demonstrate that they both exist. |
| 408 | 29 | 50 | ||
| 409 | 30 | 51 | ||
| 411 | 31 | == Navigating to the blueprint registration form == | 52 | Navigating to the blueprint registration form |
| 412 | 53 | --------------------------------------------- | ||
| 413 | 32 | 54 | ||
| 414 | 33 | We'll start by demonstrating that users can navigate to the blueprint | 55 | We'll start by demonstrating that users can navigate to the blueprint |
| 415 | 34 | registration form from each of the supported locations. | 56 | registration form from each of the supported locations. |
| 416 | 35 | 57 | ||
| 417 | 36 | 58 | ||
| 419 | 37 | === From the Blueprints home page === | 59 | From the Blueprints home page |
| 420 | 60 | ............................. | ||
| 421 | 38 | 61 | ||
| 422 | 39 | Starting from the Blueprints home page: | 62 | Starting from the Blueprints home page: |
| 423 | 40 | 63 | ||
| 424 | @@ -46,7 +69,8 @@ | |||
| 425 | 46 | <a href="+new" id="addspec"> <img alt="Register a blueprint"... | 69 | <a href="+new" id="addspec"> <img alt="Register a blueprint"... |
| 426 | 47 | 70 | ||
| 427 | 48 | 71 | ||
| 429 | 49 | === From a distribution === | 72 | From a distribution |
| 430 | 73 | ................... | ||
| 431 | 50 | 74 | ||
| 432 | 51 | Starting from the Ubuntu distribution page: | 75 | Starting from the Ubuntu distribution page: |
| 433 | 52 | 76 | ||
| 434 | @@ -68,7 +92,8 @@ | |||
| 435 | 68 | class="menu-link-new...>Register a blueprint</a> | 92 | class="menu-link-new...>Register a blueprint</a> |
| 436 | 69 | 93 | ||
| 437 | 70 | 94 | ||
| 439 | 71 | === From a distribution series === | 95 | From a distribution series |
| 440 | 96 | .......................... | ||
| 441 | 72 | 97 | ||
| 442 | 73 | Starting from the Ubuntu Hoary distribution series page: | 98 | Starting from the Ubuntu Hoary distribution series page: |
| 443 | 74 | 99 | ||
| 444 | @@ -83,7 +108,8 @@ | |||
| 445 | 83 | class="menu-link-new...>Register a blueprint</a> | 108 | class="menu-link-new...>Register a blueprint</a> |
| 446 | 84 | 109 | ||
| 447 | 85 | 110 | ||
| 449 | 86 | === From a product === | 111 | From a product |
| 450 | 112 | .............. | ||
| 451 | 87 | 113 | ||
| 452 | 88 | Starting from the Bazaar product page: | 114 | Starting from the Bazaar product page: |
| 453 | 89 | 115 | ||
| 454 | @@ -109,7 +135,8 @@ | |||
| 455 | 109 | >>> print extract_text(find_main_content(user_browser.contents)) | 135 | >>> print extract_text(find_main_content(user_browser.contents)) |
| 456 | 110 | Register a new blueprint... | 136 | Register a new blueprint... |
| 457 | 111 | 137 | ||
| 459 | 112 | === From a product series === | 138 | From a product series |
| 460 | 139 | ..................... | ||
| 461 | 113 | 140 | ||
| 462 | 114 | Starting from the Mozilla Firefox product series page: | 141 | Starting from the Mozilla Firefox product series page: |
| 463 | 115 | 142 | ||
| 464 | @@ -125,7 +152,8 @@ | |||
| 465 | 125 | class="menu-link-new...>Register a blueprint</a> | 152 | class="menu-link-new...>Register a blueprint</a> |
| 466 | 126 | 153 | ||
| 467 | 127 | 154 | ||
| 469 | 128 | === From a project === | 155 | From a project |
| 470 | 156 | .............. | ||
| 471 | 129 | 157 | ||
| 472 | 130 | Starting from the Mozilla project page: | 158 | Starting from the Mozilla project page: |
| 473 | 131 | 159 | ||
| 474 | @@ -140,7 +168,8 @@ | |||
| 475 | 140 | class="menu-link-new...>Register a blueprint</a> | 168 | class="menu-link-new...>Register a blueprint</a> |
| 476 | 141 | 169 | ||
| 477 | 142 | 170 | ||
| 479 | 143 | === From a sprint === | 171 | From a sprint |
| 480 | 172 | ............. | ||
| 481 | 144 | 173 | ||
| 482 | 145 | Starting from the Future Mega Meeting sprint page: | 174 | Starting from the Future Mega Meeting sprint page: |
| 483 | 146 | 175 | ||
| 484 | @@ -155,14 +184,16 @@ | |||
| 485 | 155 | class="menu-link-new...>Register a blueprint</a> | 184 | class="menu-link-new...>Register a blueprint</a> |
| 486 | 156 | 185 | ||
| 487 | 157 | 186 | ||
| 489 | 158 | == Registering a blueprint == | 187 | Registering a blueprint |
| 490 | 188 | ----------------------- | ||
| 491 | 159 | 189 | ||
| 492 | 160 | The blueprint registration form allows users to register a blueprint. The | 190 | The blueprint registration form allows users to register a blueprint. The |
| 493 | 161 | appearance and behaviour of the form depends on where the user has navigated | 191 | appearance and behaviour of the form depends on where the user has navigated |
| 494 | 162 | from. | 192 | from. |
| 495 | 163 | 193 | ||
| 496 | 164 | 194 | ||
| 498 | 165 | === Registering a blueprint from the Blueprints home page === | 195 | Registering a blueprint from the Blueprints home page |
| 499 | 196 | ..................................................... | ||
| 500 | 166 | 197 | ||
| 501 | 167 | We'll start from the default blueprint registration form: | 198 | We'll start from the default blueprint registration form: |
| 502 | 168 | 199 | ||
| 503 | @@ -216,7 +247,8 @@ | |||
| 504 | 216 | Network Magic: Auto Network Detection... | 247 | Network Magic: Auto Network Detection... |
| 505 | 217 | 248 | ||
| 506 | 218 | 249 | ||
| 508 | 219 | === Registering a blueprint from a distribution === | 250 | Registering a blueprint from a distribution |
| 509 | 251 | ........................................... | ||
| 510 | 220 | 252 | ||
| 511 | 221 | When a blueprint is registered from a distribution, the new blueprint is | 253 | When a blueprint is registered from a distribution, the new blueprint is |
| 512 | 222 | automatically targeted to the distribution. | 254 | automatically targeted to the distribution. |
| 513 | @@ -239,7 +271,8 @@ | |||
| 514 | 239 | Network Magic: Auto Network Detection... | 271 | Network Magic: Auto Network Detection... |
| 515 | 240 | 272 | ||
| 516 | 241 | 273 | ||
| 518 | 242 | === Registering a blueprint from a distribution series === | 274 | Registering a blueprint from a distribution series |
| 519 | 275 | .................................................. | ||
| 520 | 243 | 276 | ||
| 521 | 244 | When a blueprint is registered from a distribution series, the new blueprint | 277 | When a blueprint is registered from a distribution series, the new blueprint |
| 522 | 245 | is automatically targeted to the parent distribution. In addition, Launchpad | 278 | is automatically targeted to the parent distribution. In addition, Launchpad |
| 523 | @@ -326,7 +359,8 @@ | |||
| 524 | 326 | Series goal: Accepted for hoary | 359 | Series goal: Accepted for hoary |
| 525 | 327 | 360 | ||
| 526 | 328 | 361 | ||
| 528 | 329 | === Registering a blueprint from a product === | 362 | Registering a blueprint from a product |
| 529 | 363 | ...................................... | ||
| 530 | 330 | 364 | ||
| 531 | 331 | When a blueprint is registered from a product, the new blueprint is | 365 | When a blueprint is registered from a product, the new blueprint is |
| 532 | 332 | automatically targeted to the product. | 366 | automatically targeted to the product. |
| 533 | @@ -355,7 +389,8 @@ | |||
| 534 | 355 | SVG Support... | 389 | SVG Support... |
| 535 | 356 | 390 | ||
| 536 | 357 | 391 | ||
| 538 | 358 | === Registering a blueprint from a product series === | 392 | Registering a blueprint from a product series |
| 539 | 393 | ............................................. | ||
| 540 | 359 | 394 | ||
| 541 | 360 | When a blueprint is registered from a product series, the new blueprint is | 395 | When a blueprint is registered from a product series, the new blueprint is |
| 542 | 361 | automatically targeted to the parent product. In addition, Launchpad allows | 396 | automatically targeted to the parent product. In addition, Launchpad allows |
| 543 | @@ -437,7 +472,8 @@ | |||
| 544 | 437 | Series goal: Accepted for 1.0 | 472 | Series goal: Accepted for 1.0 |
| 545 | 438 | 473 | ||
| 546 | 439 | 474 | ||
| 548 | 440 | === Registering a blueprint from a project === | 475 | Registering a blueprint from a project |
| 549 | 476 | ...................................... | ||
| 550 | 441 | 477 | ||
| 551 | 442 | Let's register a blueprint from the Mozilla project: | 478 | Let's register a blueprint from the Mozilla project: |
| 552 | 443 | 479 | ||
| 553 | @@ -470,7 +506,8 @@ | |||
| 554 | 470 | SVG Support... | 506 | SVG Support... |
| 555 | 471 | 507 | ||
| 556 | 472 | 508 | ||
| 558 | 473 | === Registering a blueprint from a sprint === | 509 | Registering a blueprint from a sprint |
| 559 | 510 | ..................................... | ||
| 560 | 474 | 511 | ||
| 561 | 475 | When a blueprint is registered from a sprint, the new blueprint is | 512 | When a blueprint is registered from a sprint, the new blueprint is |
| 562 | 476 | automatically proposed as a topic for discussion at the sprint. | 513 | automatically proposed as a topic for discussion at the sprint. |
| 563 | @@ -532,7 +569,8 @@ | |||
| 564 | 532 | <...darcs-imports-2... | 569 | <...darcs-imports-2... |
| 565 | 533 | 570 | ||
| 566 | 534 | 571 | ||
| 568 | 535 | === Proposing any blueprint as a sprint topic during registration === | 572 | Proposing any blueprint as a sprint topic during registration |
| 569 | 573 | ............................................................. | ||
| 570 | 536 | 574 | ||
| 571 | 537 | While blueprints can be registered from sprints directly, it's also possible | 575 | While blueprints can be registered from sprints directly, it's also possible |
| 572 | 538 | to propose any blueprint for discussion at a sprint during registration. | 576 | to propose any blueprint for discussion at a sprint during registration. |
| 573 | @@ -559,10 +597,11 @@ | |||
| 574 | 559 | <...spec-for-sprint...> | 597 | <...spec-for-sprint...> |
| 575 | 560 | 598 | ||
| 576 | 561 | 599 | ||
| 581 | 562 | == Restrictions when registering blueprints == | 600 | Restrictions when registering blueprints |
| 582 | 563 | 601 | ---------------------------------------- | |
| 583 | 564 | 602 | ||
| 584 | 565 | === Names must be unique === | 603 | Names must be unique |
| 585 | 604 | .................... | ||
| 586 | 566 | 605 | ||
| 587 | 567 | It's not possible to register a blueprint with the same name as an existing | 606 | It's not possible to register a blueprint with the same name as an existing |
| 588 | 568 | blueprint. | 607 | blueprint. |
| 589 | @@ -602,7 +641,8 @@ | |||
| 590 | 602 | There is 1 error...already in use by another blueprint... | 641 | There is 1 error...already in use by another blueprint... |
| 591 | 603 | 642 | ||
| 592 | 604 | 643 | ||
| 594 | 605 | === Names must be valid === | 644 | Names must be valid |
| 595 | 645 | ................... | ||
| 596 | 606 | 646 | ||
| 597 | 607 | Blueprint names must conform to a set pattern: | 647 | Blueprint names must conform to a set pattern: |
| 598 | 608 | 648 | ||
| 599 | @@ -635,7 +675,8 @@ | |||
| 600 | 635 | Network Magic: Automatic Network Detection... | 675 | Network Magic: Automatic Network Detection... |
| 601 | 636 | 676 | ||
| 602 | 637 | 677 | ||
| 604 | 638 | === URLs must be unique === | 678 | URLs must be unique |
| 605 | 679 | ................... | ||
| 606 | 639 | 680 | ||
| 607 | 640 | It's not possible to register a blueprint with the same URL as an existing | 681 | It's not possible to register a blueprint with the same URL as an existing |
| 608 | 641 | blueprint: | 682 | blueprint: |
| 609 | @@ -653,7 +694,8 @@ | |||
| 610 | 653 | There is 1 error...already registered by another blueprint... | 694 | There is 1 error...already registered by another blueprint... |
| 611 | 654 | 695 | ||
| 612 | 655 | 696 | ||
| 614 | 656 | === Registering blueprints from other locations === | 697 | Registering blueprints from other locations |
| 615 | 698 | ........................................... | ||
| 616 | 657 | 699 | ||
| 617 | 658 | There are some locations in Launchpad from which it's not possible to register | 700 | There are some locations in Launchpad from which it's not possible to register |
| 618 | 659 | a blueprint. To start with, it's not possible to register a blueprint from an | 701 | a blueprint. To start with, it's not possible to register a blueprint from an |
| 619 | 660 | 702 | ||
| 620 | === modified file 'lib/lp/blueprints/stories/blueprints/xx-productseries.txt' | |||
| 621 | --- lib/lp/blueprints/stories/blueprints/xx-productseries.txt 2010-08-26 02:30:06 +0000 | |||
| 622 | +++ lib/lp/blueprints/stories/blueprints/xx-productseries.txt 2010-09-17 14:23:57 +0000 | |||
| 623 | @@ -2,6 +2,18 @@ | |||
| 624 | 2 | Targeting to ProductSeries | 2 | Targeting to ProductSeries |
| 625 | 3 | ========================== | 3 | ========================== |
| 626 | 4 | 4 | ||
| 627 | 5 | A number of tests in this need a product with blueprints enabled, so we'll | ||
| 628 | 6 | enable them on firefox. | ||
| 629 | 7 | |||
| 630 | 8 | >>> from zope.component import getUtility | ||
| 631 | 9 | >>> from lp.app.enums import ServiceUsage | ||
| 632 | 10 | >>> from lp.registry.interfaces.product import IProductSet | ||
| 633 | 11 | >>> login('admin@canonical.com') | ||
| 634 | 12 | >>> firefox = getUtility(IProductSet).getByName('firefox') | ||
| 635 | 13 | >>> firefox.blueprints_usage = ServiceUsage.LAUNCHPAD | ||
| 636 | 14 | >>> transaction.commit() | ||
| 637 | 15 | >>> logout() | ||
| 638 | 16 | |||
| 639 | 5 | In terms of feature management for release series and for distroseriess, we | 17 | In terms of feature management for release series and for distroseriess, we |
| 640 | 6 | want to target one of these specs to the 1.0 series. We will use the "e4x" | 18 | want to target one of these specs to the 1.0 series. We will use the "e4x" |
| 641 | 7 | specification. | 19 | specification. |
| 642 | 8 | 20 | ||
| 643 | === modified file 'lib/lp/blueprints/stories/standalone/xx-batching.txt' | |||
| 644 | --- lib/lp/blueprints/stories/standalone/xx-batching.txt 2009-09-22 10:48:09 +0000 | |||
| 645 | +++ lib/lp/blueprints/stories/standalone/xx-batching.txt 2010-09-17 14:23:57 +0000 | |||
| 646 | @@ -24,11 +24,25 @@ | |||
| 647 | 24 | >>> browser.url | 24 | >>> browser.url |
| 648 | 25 | 'http://launchpad.dev/big-project' | 25 | 'http://launchpad.dev/big-project' |
| 649 | 26 | 26 | ||
| 655 | 27 | In the beginning, a project has no blueprints: | 27 | In the beginning, a project hasn't had blueprints set up: |
| 656 | 28 | 28 | ||
| 657 | 29 | >>> browser.open("http://blueprints.launchpad.dev/big-project") | 29 | >>> browser.open("http://blueprints.launchpad.dev/big-project") |
| 658 | 30 | >>> print extract_text(find_main_content(browser.contents)) | 30 | >>> print extract_text(find_main_content(browser.contents)) |
| 659 | 31 | Blueprints...Register the first blueprint in this project!... | 31 | Blueprints...does not know how...Configure blueprints... |
| 660 | 32 | |||
| 661 | 33 | But it's easy to change that. | ||
| 662 | 34 | |||
| 663 | 35 | >>> browser.open("http://blueprints.launchpad.dev/big-project/+configure-blueprints") | ||
| 664 | 36 | >>> browser.getControl(name='field.blueprints_usage').value = ['LAUNCHPAD'] | ||
| 665 | 37 | >>> browser.getControl('Change').click() | ||
| 666 | 38 | >>> browser.url | ||
| 667 | 39 | 'http://blueprints.launchpad.dev/big-project' | ||
| 668 | 40 | |||
| 669 | 41 | Initially the newly enabled feature has no blueprints. | ||
| 670 | 42 | |||
| 671 | 43 | >>> browser.open("http://blueprints.launchpad.dev/big-project") | ||
| 672 | 44 | >>> print extract_text(find_main_content(browser.contents)) | ||
| 673 | 45 | Blueprints...first blueprint in this project!... | ||
| 674 | 32 | 46 | ||
| 675 | 33 | We'll go ahead and add just a single blueprint: | 47 | We'll go ahead and add just a single blueprint: |
| 676 | 34 | 48 | ||
| 677 | 35 | 49 | ||
| 678 | === modified file 'lib/lp/blueprints/stories/standalone/xx-index.txt' | |||
| 679 | --- lib/lp/blueprints/stories/standalone/xx-index.txt 2009-09-22 16:42:19 +0000 | |||
| 680 | +++ lib/lp/blueprints/stories/standalone/xx-index.txt 2010-09-17 14:23:57 +0000 | |||
| 681 | @@ -1,6 +1,20 @@ | |||
| 682 | 1 | ===================== | 1 | ===================== |
| 683 | 2 | Blueprints index page | 2 | Blueprints index page |
| 684 | 3 | ===================== | 3 | ===================== |
| 685 | 4 | Enabling Firefox | ||
| 686 | 5 | ---------------- | ||
| 687 | 6 | |||
| 688 | 7 | For a product to work in blueprints, it must be active, so we'll activate | ||
| 689 | 8 | blueprints for firefox. | ||
| 690 | 9 | |||
| 691 | 10 | >>> from zope.component import getUtility | ||
| 692 | 11 | >>> from lp.app.enums import ServiceUsage | ||
| 693 | 12 | >>> from lp.registry.interfaces.product import IProductSet | ||
| 694 | 13 | >>> login('admin@canonical.com') | ||
| 695 | 14 | >>> firefox = getUtility(IProductSet).getByName('firefox') | ||
| 696 | 15 | >>> firefox.blueprints_usage = ServiceUsage.LAUNCHPAD | ||
| 697 | 16 | >>> transaction.commit() | ||
| 698 | 17 | >>> logout() | ||
| 699 | 4 | 18 | ||
| 700 | 5 | The blueprints index page allows users to search for blueprints within | 19 | The blueprints index page allows users to search for blueprints within |
| 701 | 6 | a single Launchpad project or across all projects. | 20 | a single Launchpad project or across all projects. |
| 702 | 7 | 21 | ||
| 703 | === modified file 'lib/lp/blueprints/stories/standalone/xx-overview.txt' | |||
| 704 | --- lib/lp/blueprints/stories/standalone/xx-overview.txt 2009-11-26 03:06:58 +0000 | |||
| 705 | +++ lib/lp/blueprints/stories/standalone/xx-overview.txt 2010-09-17 14:23:57 +0000 | |||
| 706 | @@ -7,6 +7,17 @@ | |||
| 707 | 7 | blueprints, and also other pages where users can browse through complete | 7 | blueprints, and also other pages where users can browse through complete |
| 708 | 8 | lists of blueprints for a given product or distribution. | 8 | lists of blueprints for a given product or distribution. |
| 709 | 9 | 9 | ||
| 710 | 10 | A number of tests in this need a product with blueprints enabled, so we'll | ||
| 711 | 11 | enable them on firefox. | ||
| 712 | 12 | |||
| 713 | 13 | >>> from zope.component import getUtility | ||
| 714 | 14 | >>> from lp.app.enums import ServiceUsage | ||
| 715 | 15 | >>> from lp.registry.interfaces.product import IProductSet | ||
| 716 | 16 | >>> login('admin@canonical.com') | ||
| 717 | 17 | >>> firefox = getUtility(IProductSet).getByName('firefox') | ||
| 718 | 18 | >>> firefox.blueprints_usage = ServiceUsage.LAUNCHPAD | ||
| 719 | 19 | >>> transaction.commit() | ||
| 720 | 20 | >>> logout() | ||
| 721 | 10 | 21 | ||
| 722 | 11 | Viewing lists of blueprints | 22 | Viewing lists of blueprints |
| 723 | 12 | =========================== | 23 | =========================== |
| 724 | 13 | 24 | ||
| 725 | === modified file 'lib/lp/blueprints/stories/standalone/xx-views.txt' | |||
| 726 | --- lib/lp/blueprints/stories/standalone/xx-views.txt 2009-09-22 10:48:09 +0000 | |||
| 727 | +++ lib/lp/blueprints/stories/standalone/xx-views.txt 2010-09-17 14:23:57 +0000 | |||
| 728 | @@ -1,6 +1,22 @@ | |||
| 732 | 1 | == Blueprint views == | 1 | Blueprint views |
| 733 | 2 | 2 | =============== | |
| 734 | 3 | === Viewing current blueprints === | 3 | |
| 735 | 4 | Set Up | ||
| 736 | 5 | ------ | ||
| 737 | 6 | A number of tests in this need a product with blueprints enabled, so we'll | ||
| 738 | 7 | enable them on firefox. | ||
| 739 | 8 | |||
| 740 | 9 | >>> from zope.component import getUtility | ||
| 741 | 10 | >>> from lp.app.enums import ServiceUsage | ||
| 742 | 11 | >>> from lp.registry.interfaces.product import IProductSet | ||
| 743 | 12 | >>> login('admin@canonical.com') | ||
| 744 | 13 | >>> firefox = getUtility(IProductSet).getByName('firefox') | ||
| 745 | 14 | >>> firefox.blueprints_usage = ServiceUsage.LAUNCHPAD | ||
| 746 | 15 | >>> transaction.commit() | ||
| 747 | 16 | >>> logout() | ||
| 748 | 17 | |||
| 749 | 18 | Viewing current blueprints | ||
| 750 | 19 | -------------------------- | ||
| 751 | 4 | 20 | ||
| 752 | 5 | We should be able to see a "+specs" and a "+portlet-latestspecs" view | 21 | We should be able to see a "+specs" and a "+portlet-latestspecs" view |
| 753 | 6 | on sprint, product, person, project and distribution. | 22 | on sprint, product, person, project and distribution. |
| 754 | @@ -143,7 +159,8 @@ | |||
| 755 | 143 | ...Activating Usplash... | 159 | ...Activating Usplash... |
| 756 | 144 | 160 | ||
| 757 | 145 | 161 | ||
| 759 | 146 | === Viewing all blueprints === | 162 | Viewing all blueprints |
| 760 | 163 | ---------------------- | ||
| 761 | 147 | 164 | ||
| 762 | 148 | From time to time it's useful to review the complete list of all blueprints | 165 | From time to time it's useful to review the complete list of all blueprints |
| 763 | 149 | associated with a blueprint target, including those blueprints that have | 166 | associated with a blueprint target, including those blueprints that have |
| 764 | 150 | 167 | ||
| 765 | === added file 'lib/lp/blueprints/templates/unknown-specs.pt' | |||
| 766 | --- lib/lp/blueprints/templates/unknown-specs.pt 1970-01-01 00:00:00 +0000 | |||
| 767 | +++ lib/lp/blueprints/templates/unknown-specs.pt 2010-09-17 14:23:57 +0000 | |||
| 768 | @@ -0,0 +1,93 @@ | |||
| 769 | 1 | <html | ||
| 770 | 2 | xmlns="http://www.w3.org/1999/xhtml" | ||
| 771 | 3 | xmlns:tal="http://xml.zope.org/namespaces/tal" | ||
| 772 | 4 | xmlns:metal="http://xml.zope.org/namespaces/metal" | ||
| 773 | 5 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" | ||
| 774 | 6 | metal:use-macro="view/macro:page/main_side" | ||
| 775 | 7 | i18n:domain="launchpad" | ||
| 776 | 8 | > | ||
| 777 | 9 | |||
| 778 | 10 | <body> | ||
| 779 | 11 | |||
| 780 | 12 | <div metal:fill-slot="main"> | ||
| 781 | 13 | <div class="top-portlet"> | ||
| 782 | 14 | <div id="specs-unknown"> | ||
| 783 | 15 | <strong> | ||
| 784 | 16 | <div tal:omit-tag tal:condition="view/is_project"> | ||
| 785 | 17 | <p> | ||
| 786 | 18 | Launchpad does not know how | ||
| 787 | 19 | <tal:project replace="view/context/displayname" /> tracks feature | ||
| 788 | 20 | planning or documentation. | ||
| 789 | 21 | </p> | ||
| 790 | 22 | </div> | ||
| 791 | 23 | |||
| 792 | 24 | <div tal:omit-tag tal:condition="view/is_series"> | ||
| 793 | 25 | <div | ||
| 794 | 26 | tal:omit-tag | ||
| 795 | 27 | tal:define="target python:view.context.product and view.context.product or view.context.distribution; | ||
| 796 | 28 | blueprints_usage target/blueprints_usage"> | ||
| 797 | 29 | <p tal:condition="blueprints_usage/enumvalue:EXTERNAL"> | ||
| 798 | 30 | <tal:project replace="target/displayname" />'s | ||
| 799 | 31 | <tal:project replace="view/context/displayname" /> series does | ||
| 800 | 32 | not use Launchpap for planning or documentation. | ||
| 801 | 33 | </p> | ||
| 802 | 34 | <p tal:condition="blueprints_usage/enumvalue:NOT_APPLICABLE"> | ||
| 803 | 35 | <tal:project replace="target/displayname" />'s | ||
| 804 | 36 | <tal:project replace="view/context/displayname" /> series does not track | ||
| 805 | 37 | feature planning or documentation. | ||
| 806 | 38 | </p> | ||
| 807 | 39 | <p tal:condition="blueprints_usage/enumvalue:UNKNOWN"> | ||
| 808 | 40 | Launchpad does not know how | ||
| 809 | 41 | <tal:project replace="target/displayname" />'s | ||
| 810 | 42 | <tal:project replace="view/context/displayname" /> series tracks feature | ||
| 811 | 43 | planning or documentation. | ||
| 812 | 44 | </p> | ||
| 813 | 45 | </div> | ||
| 814 | 46 | </div> | ||
| 815 | 47 | |||
| 816 | 48 | <div tal:omit-tag | ||
| 817 | 49 | tal:condition="python:not (view.is_project or view.is_series)"> | ||
| 818 | 50 | <div tal:omit-tag tal:define="blueprints_usage view/context/blueprints_usage"> | ||
| 819 | 51 | <p tal:condition="blueprints_usage/enumvalue:EXTERNAL"> | ||
| 820 | 52 | <tal:project replace="view/context/displayname" /> does not use launchpad | ||
| 821 | 53 | for planning or documentation. | ||
| 822 | 54 | </p> | ||
| 823 | 55 | <p tal:condition="blueprints_usage/enumvalue:NOT_APPLICABLE"> | ||
| 824 | 56 | <tal:project replace="view/context/displayname" /> does not track | ||
| 825 | 57 | feature planning or documentation. | ||
| 826 | 58 | </p> | ||
| 827 | 59 | <p tal:condition="blueprints_usage/enumvalue:UNKNOWN"> | ||
| 828 | 60 | launchpad does not know how | ||
| 829 | 61 | <tal:project replace="view/context/displayname" /> tracks feature | ||
| 830 | 62 | planning or documentation. | ||
| 831 | 63 | </p> | ||
| 832 | 64 | </div> | ||
| 833 | 65 | </div> | ||
| 834 | 66 | </strong> | ||
| 835 | 67 | |||
| 836 | 68 | <div tal:omit-tag tal:condition="view/has_wiki"> | ||
| 837 | 69 | <p id="wiki-fallback" | ||
| 838 | 70 | tal:define="wiki view/context/wikiurl" | ||
| 839 | 71 | tal:condition="wiki"> | ||
| 840 | 72 | <tal:project replace="view/context/displayname" /> has a wiki, which | ||
| 841 | 73 | may be used for feature plannning and documentation.<br /> | ||
| 842 | 74 | <a tal:attributes="href view/context/wikiurl"> | ||
| 843 | 75 | <tal:project replace="view/context/displayname" /> wiki | ||
| 844 | 76 | </a> | ||
| 845 | 77 | </p> | ||
| 846 | 78 | </div> | ||
| 847 | 79 | </div> | ||
| 848 | 80 | |||
| 849 | 81 | <p id="configure-support" | ||
| 850 | 82 | tal:condition="view/can_configure_blueprints"> | ||
| 851 | 83 | Launchpad Blueprints allow your project to track feature planning and | ||
| 852 | 84 | documentation.<br /> | ||
| 853 | 85 | <a class="info sprite" | ||
| 854 | 86 | href="https://help.launchpad.net/BlueprintDocumentation"> | ||
| 855 | 87 | Read more about tracking feature planning with blueprints</a><br /> | ||
| 856 | 88 | <a tal:replace="structure context/menu:overview/configure_blueprints/fmt:link" /><br /> | ||
| 857 | 89 | </p> | ||
| 858 | 90 | </div> | ||
| 859 | 91 | </div> | ||
| 860 | 92 | </body> | ||
| 861 | 93 | </html> | ||
| 862 | 0 | 94 | ||
| 863 | === modified file 'lib/lp/registry/browser/distribution.py' | |||
| 864 | --- lib/lp/registry/browser/distribution.py 2010-09-11 19:54:26 +0000 | |||
| 865 | +++ lib/lp/registry/browser/distribution.py 2010-09-17 14:23:57 +0000 | |||
| 866 | @@ -342,6 +342,7 @@ | |||
| 867 | 342 | 'announcements', | 342 | 'announcements', |
| 868 | 343 | 'ppas', | 343 | 'ppas', |
| 869 | 344 | 'configure_answers', | 344 | 'configure_answers', |
| 870 | 345 | 'configure_blueprints', | ||
| 871 | 345 | ] | 346 | ] |
| 872 | 346 | 347 | ||
| 873 | 347 | @enabled_with_permission('launchpad.Edit') | 348 | @enabled_with_permission('launchpad.Edit') |
| 874 | @@ -453,6 +454,12 @@ | |||
| 875 | 453 | summary = 'Allow users to ask questions on this project' | 454 | summary = 'Allow users to ask questions on this project' |
| 876 | 454 | return Link('+edit', text, summary, icon='edit') | 455 | return Link('+edit', text, summary, icon='edit') |
| 877 | 455 | 456 | ||
| 878 | 457 | @enabled_with_permission('launchpad.Edit') | ||
| 879 | 458 | def configure_blueprints(self): | ||
| 880 | 459 | text = 'Configure blueprints' | ||
| 881 | 460 | summary = 'Enable tracking of feature planning.' | ||
| 882 | 461 | return Link('+edit', text, summary, icon='edit') | ||
| 883 | 462 | |||
| 884 | 456 | 463 | ||
| 885 | 457 | class DerivativeDistributionOverviewMenu(DistributionOverviewMenu): | 464 | class DerivativeDistributionOverviewMenu(DistributionOverviewMenu): |
| 886 | 458 | 465 | ||
| 887 | 459 | 466 | ||
| 888 | === modified file 'lib/lp/registry/browser/product.py' | |||
| 889 | --- lib/lp/registry/browser/product.py 2010-09-03 15:02:39 +0000 | |||
| 890 | +++ lib/lp/registry/browser/product.py 2010-09-17 14:23:57 +0000 | |||
| 891 | @@ -547,7 +547,7 @@ | |||
| 892 | 547 | @enabled_with_permission('launchpad.Edit') | 547 | @enabled_with_permission('launchpad.Edit') |
| 893 | 548 | def configure_blueprints(self): | 548 | def configure_blueprints(self): |
| 894 | 549 | text = 'Configure blueprints' | 549 | text = 'Configure blueprints' |
| 896 | 550 | summary = 'Enable tracking of specifications and meetings' | 550 | summary = 'Enable tracking of feature planning.' |
| 897 | 551 | return Link('+configure-blueprints', text, summary, icon='edit') | 551 | return Link('+configure-blueprints', text, summary, icon='edit') |
| 898 | 552 | 552 | ||
| 899 | 553 | @enabled_with_permission('launchpad.Edit') | 553 | @enabled_with_permission('launchpad.Edit') |
| 900 | 554 | 554 | ||
| 901 | === modified file 'lib/lp/registry/browser/tests/pillar-views.txt' | |||
| 902 | --- lib/lp/registry/browser/tests/pillar-views.txt 2010-09-14 21:50:32 +0000 | |||
| 903 | +++ lib/lp/registry/browser/tests/pillar-views.txt 2010-09-17 14:23:57 +0000 | |||
| 904 | @@ -36,8 +36,8 @@ | |||
| 905 | 36 | True | 36 | True |
| 906 | 37 | >>> print view.answers_usage.name | 37 | >>> print view.answers_usage.name |
| 907 | 38 | LAUNCHPAD | 38 | LAUNCHPAD |
| 910 | 39 | >>> view.translations_usage.name | 39 | >>> print view.translations_usage.name |
| 911 | 40 | 'UNKNOWN' | 40 | UNKNOWN |
| 912 | 41 | >>> print view.blueprints_usage.name | 41 | >>> print view.blueprints_usage.name |
| 913 | 42 | UNKNOWN | 42 | UNKNOWN |
| 914 | 43 | >>> print view.codehosting_usage.name | 43 | >>> print view.codehosting_usage.name |
Sorry about the bad update. Just in case of divergences between the prereq and this post update from devel, here's the diff:
=== modified file 'lib/lp/
--- lib/lp/
+++ lib/lp/
@@ -53,8 +53,7 @@
- name="+specs"
- template=
+ name="+specs"/>
@@ -500,8 +499,7 @@
- name="+specs"
- template=
+ name="+specs"/>
@@ -532,8 +530,7 @@
- name="+specs"
- template=
+ name="+specs"/>
@@ -583,8 +580,7 @@
- name="+specs"
- template=
+ name="+specs"/>
=== modified file 'lib/lp/
--- lib/lp/
+++ lib/lp/
@@ -15,6 +15,7 @@
from operator import itemgetter
+from z3c.ptcompat import ViewPageTemplat
from zope.component import queryMultiAdapter
from canonical.config import config
@@ -32,6 +33,8 @@
Link,
)
from canonical.
+from lp.app.enums import service_
+from lp.app.
from lp.blueprints.
Specificat
Specificat
@@ -133,6 +136,50 @@
is_sprint = False
has_drivers = False
+ # Templates for the various conditions of blueprints:
+ # * On Launchpad
+ # * External
+ # * Disabled
+ # * Unknown
+ default_template = ViewPageTemplat
+ '../templates/
+ not_launchpad_
+ '../templates/
+
+ @property
+ def template(self):
+ # If the template has been defined in the zcml, use that, as t...