Merge lp:~jcsackett/launchpad/blueprints-in-ui-not-specification into lp:launchpad

Proposed by j.c.sackett
Status: Merged
Approved by: Aaron Bentley
Approved revision: no longer in the source branch.
Merged at revision: 16299
Proposed branch: lp:~jcsackett/launchpad/blueprints-in-ui-not-specification
Merge into: lp:launchpad
Diff against target: 51 lines (+4/-4)
4 files modified
lib/lp/registry/interfaces/pillar.py (+1/-1)
lib/lp/registry/interfaces/product.py (+1/-1)
lib/lp/registry/javascript/sharing/tests/test_pillarsharingview.html (+1/-1)
lib/lp/registry/templates/pillar-sharing.pt (+1/-1)
To merge this branch: bzr merge lp:~jcsackett/launchpad/blueprints-in-ui-not-specification
Reviewer Review Type Date Requested Status
Aaron Bentley (community) Approve
Review via email: mp+135503@code.launchpad.net

Commit message

Updates Specification sharing policy to Blueprint sharing policy in the UI.

Description of the change

Summary
=======
On the sharing page, we refer to the Specification sharing policy; while in
some places we do reference specifications we generally want Blueprints.
Accordingly, this should be changed in the UI.

Preimp
======
None.

Implementation
==============
Updated UI facing uses of "Specification sharing policy" to "Blueprint sharing
policy".

Updated the title attribute of the pillar and product additionally; it's
possible these should be left alone. If the reviewer feels so, I'll change
them back without argument.

Updated reference in tests.

Tests
=====
bin/test -vvct test_pillarsharing

QA
==
Ensure the text is changed on the +sharing page.

LoC
===
Part of Private Projects.

Lint
====

Checking for conflicts and issues in changed files.

Linting changed files:
  lib/lp/registry/interfaces/pillar.py
  lib/lp/registry/templates/pillar-sharing.pt
  lib/lp/registry/interfaces/product.py
  lib/lp/registry/javascript/sharing/tests/test_pillarsharingview.html

To post a comment you must log in.
Revision history for this message
Aaron Bentley (abentley) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/registry/interfaces/pillar.py'
2--- lib/lp/registry/interfaces/pillar.py 2012-09-13 21:58:12 +0000
3+++ lib/lp/registry/interfaces/pillar.py 2012-11-21 19:45:27 +0000
4@@ -102,7 +102,7 @@
5 required=False, readonly=True, vocabulary=BugSharingPolicy),
6 as_of='devel')
7 specification_sharing_policy = exported(Choice(
8- title=_('Specification sharing policy'),
9+ title=_('Blueprint sharing policy'),
10 description=_("Sharing policy for this project's specifications."),
11 required=False, readonly=True, vocabulary=SpecificationSharingPolicy),
12 as_of='devel')
13
14=== modified file 'lib/lp/registry/interfaces/product.py'
15--- lib/lp/registry/interfaces/product.py 2012-11-13 17:03:49 +0000
16+++ lib/lp/registry/interfaces/product.py 2012-11-21 19:45:27 +0000
17@@ -655,7 +655,7 @@
18 required=True, readonly=True, vocabulary=BugSharingPolicy),
19 as_of='devel')
20 specification_sharing_policy = exported(Choice(
21- title=_('Specification sharing policy'),
22+ title=_('Blueprint sharing policy'),
23 description=_("Sharing policy for this project's specifications."),
24 required=True, readonly=True, vocabulary=SpecificationSharingPolicy),
25 as_of='devel')
26
27=== modified file 'lib/lp/registry/javascript/sharing/tests/test_pillarsharingview.html'
28--- lib/lp/registry/javascript/sharing/tests/test_pillarsharingview.html 2012-10-26 09:54:28 +0000
29+++ lib/lp/registry/javascript/sharing/tests/test_pillarsharingview.html 2012-11-21 19:45:27 +0000
30@@ -104,7 +104,7 @@
31 </tr>
32 <tr id="specification-sharing-policy-row">
33 <td id="specification-sharing-policy">
34- Specification sharing policy:&nbsp;
35+ Blueprint sharing policy:&nbsp;
36 <strong><span class="value"></span></strong>
37 <a class="editicon sprite edit action-icon"
38 style="padding-bottom: 0;">Edit</a>
39
40=== modified file 'lib/lp/registry/templates/pillar-sharing.pt'
41--- lib/lp/registry/templates/pillar-sharing.pt 2012-09-13 19:56:13 +0000
42+++ lib/lp/registry/templates/pillar-sharing.pt 2012-11-21 19:45:27 +0000
43@@ -79,7 +79,7 @@
44 <tr id="specification-sharing-policy-row"
45 tal:condition="view/specification_sharing_policies">
46 <td id="specification-sharing-policy">
47- Specification sharing policy:&nbsp;
48+ Blueprint sharing policy:&nbsp;
49 <strong><span class="value"
50 tal:content="context/specification_sharing_policy/title|string:Legacy policy"
51 ></span></strong>