Merge lp:~cjohnston/launchpad/572017 into lp:launchpad

Proposed by Chris Johnston
Status: Merged
Approved by: William Grant
Approved revision: no longer in the source branch.
Merged at revision: 16976
Proposed branch: lp:~cjohnston/launchpad/572017
Merge into: lp:launchpad
Diff against target: 25 lines (+2/-2)
2 files modified
lib/lp/code/browser/branch.py (+1/-1)
lib/lp/code/browser/sourcepackagerecipe.py (+1/-1)
To merge this branch: bzr merge lp:~cjohnston/launchpad/572017
Reviewer Review Type Date Requested Status
William Grant code Approve
Review via email: mp+213941@code.launchpad.net

Commit message

Correct branch creation form labels to not mention reassigning a branch that doesn't exist yet.

Description of the change

You can't reassign a branch that was never assigned.

To post a comment you must log in.
Revision history for this message
William Grant (wgrant) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/lp/code/browser/branch.py'
--- lib/lp/code/browser/branch.py 2014-02-24 07:19:52 +0000
+++ lib/lp/code/browser/branch.py 2014-04-02 23:15:21 +0000
@@ -1133,7 +1133,7 @@
1133 owner_field = self.schema['owner']1133 owner_field = self.schema['owner']
1134 any_owner_choice = Choice(1134 any_owner_choice = Choice(
1135 __name__='owner', title=owner_field.title,1135 __name__='owner', title=owner_field.title,
1136 description=_("As an administrator you are able to reassign"1136 description=_("As an administrator you are able to assign"
1137 " this branch to any person or team."),1137 " this branch to any person or team."),
1138 required=True, vocabulary='ValidPersonOrTeam')1138 required=True, vocabulary='ValidPersonOrTeam')
1139 any_owner_field = form.Fields(1139 any_owner_field = form.Fields(
11401140
=== modified file 'lib/lp/code/browser/sourcepackagerecipe.py'
--- lib/lp/code/browser/sourcepackagerecipe.py 2013-08-22 01:26:23 +0000
+++ lib/lp/code/browser/sourcepackagerecipe.py 2014-04-02 23:15:21 +0000
@@ -884,7 +884,7 @@
884 owner_field = self.schema['owner']884 owner_field = self.schema['owner']
885 any_owner_choice = PersonChoice(885 any_owner_choice = PersonChoice(
886 __name__='owner', title=owner_field.title,886 __name__='owner', title=owner_field.title,
887 description=(u"As an administrator you are able to reassign"887 description=(u"As an administrator you are able to assign"
888 u" this branch to any person or team."),888 u" this branch to any person or team."),
889 required=True, vocabulary='ValidPersonOrTeam')889 required=True, vocabulary='ValidPersonOrTeam')
890 any_owner_field = form.Fields(890 any_owner_field = form.Fields(