Launchpad itself

Merge lp:~barry/launchpad/421974-newpersonteam into lp:launchpad

  1. 421974-newpersonteam
  2. Merge into devel
Proposed by Barry Warsaw
Status: Merged
Approved by: Aaron Bentley
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~barry/launchpad/421974-newpersonteam
Merge into: lp:launchpad
Diff against target: None lines
To merge this branch: bzr merge lp:~barry/launchpad/421974-newpersonteam
Reviewer Review Type Date Requested Status
Curtis Hovey (community) ui Approve
Edwin Grubbs (community) ui Approve
Aaron Bentley (community) Approve
Review via email: mp+10937@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Barry Warsaw (barry) wrote :

= Summary =

This branch converts /people/+newteam and /people/+newperson to UI 3.0.

== Proposed fix ==

Update the templates to 3.0 format.

== Pre-implementation notes ==

None.

== Implementation details ==

The changes were pretty mechanical, except that I had to fix the way the views
specified the page label and page title, and I had to remove the pagetitles.py
cruft. These pages were inconsistent in the way it defined they label and
title, so I updated them to the current understanding of how they should be
defined (though this may or may not change in the future -- that's outside the
scope of this branch).

I also reformatted the TAL to be consistently indented.

== Tests ==

bin/test -vv -t launchpadlib.txt -t front-pages.txt -t standalone -t private-team-creation-views.txt -t stories/teammembership -t create-lists.txt -t recover.txt -t modify-lists.txt

== Demo and Q/A ==

http://launchpad.dev/people/+newperson
http://launchpad.dev/people/+newteam

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/canonical/launchpad/pagetitles.py
  lib/lp/registry/browser/team.py
  lib/lp/registry/templates/people-newteam.pt
  lib/lp/registry/browser/person.py
  lib/lp/registry/templates/people-newperson.pt

== Pylint notices ==

lib/lp/registry/browser/person.py
    229: [F0401] Unable to import 'lazr.uri' (No module named uri)

^^ false positive

Revision history for this message
Aaron Bentley (abentley) wrote :

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

 merge approved

Looks good.

Barry Warsaw wrote:
> Barry Warsaw has proposed merging lp:~barry/launchpad/421974-newpersonteam into lp:launchpad/devel.
>
> Requested reviews:
> Canonical Launchpad Engineering (launchpad)
>
> = Summary =
>
> This branch converts /people/+newteam and /people/+newperson to UI 3.0.
>
> == Proposed fix ==
>
> Update the templates to 3.0 format.
>
> == Pre-implementation notes ==
>
> None.
>
> == Implementation details ==
>
> The changes were pretty mechanical, except that I had to fix the way the views
> specified the page label and page title, and I had to remove the pagetitles.py
> cruft. These pages were inconsistent in the way it defined they label and
> title, so I updated them to the current understanding of how they should be
> defined (though this may or may not change in the future -- that's outside the
> scope of this branch).
>
> I also reformatted the TAL to be consistently indented.
>
> == Tests ==
>
> bin/test -vv -t launchpadlib.txt -t front-pages.txt -t standalone -t private-team-creation-views.txt -t stories/teammembership -t create-lists.txt -t recover.txt -t modify-lists.txt
>
> == Demo and Q/A ==
>
> http://launchpad.dev/people/+newperson
> http://launchpad.dev/people/+newteam
>
> = Launchpad lint =
>
> Checking for conflicts. and issues in doctests and templates.
> Running jslint, xmllint, pyflakes, and pylint.
> Using normal rules.
>
> Linting changed files:
> lib/canonical/launchpad/pagetitles.py
> lib/lp/registry/browser/team.py
> lib/lp/registry/templates/people-newteam.pt
> lib/lp/registry/browser/person.py
> lib/lp/registry/templates/people-newperson.pt
>
>
> == Pylint notices ==
>
> lib/lp/registry/browser/person.py
> 229: [F0401] Unable to import 'lazr.uri' (No module named uri)
>
> ^^ false positive
>
>

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkqcJ8UACgkQ0F+nu1YWqI0/EQCcDer/MIGaHdWpAJLPZGRc2QUT
C7UAnjwD5cwRlbuj4wtnoqCAfNsA25lK
=JIp6
-----END PGP SIGNATURE-----

review: Approve
Revision history for this message
Edwin Grubbs (edwin-grubbs) wrote :

ui=me*

review: Approve (ui)
Revision history for this message
Curtis Hovey (sinzui) wrote :

This looks good. We discussed change the team action to read [Create Team] if the test changes were not overwhelming

review: Approve (ui)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/canonical/launchpad/pagetitles.py'
--- lib/canonical/launchpad/pagetitles.py 2009-08-29 03:38:28 +0000
+++ lib/canonical/launchpad/pagetitles.py 2009-08-31 18:52:04 +0000
@@ -767,10 +767,6 @@
767767
768people_mergerequest_sent = 'Merge request sent'768people_mergerequest_sent = 'Merge request sent'
769769
770people_newperson = 'Create a new Launchpad profile'
771
772people_newteam = 'Register a new team in Launchpad'
773
774people_requestmerge = 'Merge Launchpad accounts'770people_requestmerge = 'Merge Launchpad accounts'
775771
776people_requestmerge_multiple = 'Merge Launchpad accounts'772people_requestmerge_multiple = 'Merge Launchpad accounts'
777773
=== modified file 'lib/lp/registry/browser/person.py'
--- lib/lp/registry/browser/person.py 2009-08-29 03:38:28 +0000
+++ lib/lp/registry/browser/person.py 2009-08-31 18:52:04 +0000
@@ -1379,8 +1379,10 @@
1379class PersonAddView(LaunchpadFormView):1379class PersonAddView(LaunchpadFormView):
1380 """The page where users can create new Launchpad profiles."""1380 """The page where users can create new Launchpad profiles."""
13811381
1382 label = "Create a new Launchpad profile"1382 page_title = "Create a new Launchpad profile"
1383 label = page_title
1383 schema = INewPerson1384 schema = INewPerson
1385
1384 custom_widget('creation_comment', TextAreaWidget, height=5, width=60)1386 custom_widget('creation_comment', TextAreaWidget, height=5, width=60)
13851387
1386 @action(_("Create Profile"), name="create")1388 @action(_("Create Profile"), name="create")
13871389
=== modified file 'lib/lp/registry/browser/team.py'
--- lib/lp/registry/browser/team.py 2009-08-26 16:34:38 +0000
+++ lib/lp/registry/browser/team.py 2009-08-31 18:52:04 +0000
@@ -831,8 +831,10 @@
831831
832class TeamAddView(TeamFormMixin, HasRenewalPolicyMixin, LaunchpadFormView):832class TeamAddView(TeamFormMixin, HasRenewalPolicyMixin, LaunchpadFormView):
833 """View for adding a new team."""833 """View for adding a new team."""
834
835 page_title = 'Register a new team in Launchpad'
836 label = page_title
834 schema = ITeamCreation837 schema = ITeamCreation
835 label = ''
836838
837 custom_widget('teamowner', HiddenUserWidget)839 custom_widget('teamowner', HiddenUserWidget)
838 custom_widget(840 custom_widget(
839841
=== modified file 'lib/lp/registry/templates/people-newperson.pt'
--- lib/lp/registry/templates/people-newperson.pt 2009-07-17 17:59:07 +0000
+++ lib/lp/registry/templates/people-newperson.pt 2009-08-31 17:46:33 +0000
@@ -3,37 +3,27 @@
3 xmlns:tal="http://xml.zope.org/namespaces/tal"3 xmlns:tal="http://xml.zope.org/namespaces/tal"
4 xmlns:metal="http://xml.zope.org/namespaces/metal"4 xmlns:metal="http://xml.zope.org/namespaces/metal"
5 xmlns:i18n="http://xml.zope.org/namespaces/i18n"5 xmlns:i18n="http://xml.zope.org/namespaces/i18n"
6 xml:lang="en"6 metal:use-macro="view/macro:page/main_only"
7 lang="en"
8 dir="ltr"
9 metal:use-macro="context/@@main_template/master"
10 i18n:domain="launchpad"7 i18n:domain="launchpad"
11>8 >
129 <body>
13<body>10 <div metal:fill-slot="main">
1411 <div metal:use-macro="context/@@launchpad_form/form">
15<metal:leftportlets fill-slot="portlets_one">12 <div metal:fill-slot="extra_info" class="application-summary">
16</metal:leftportlets>13 <p>
1714 Launchpad will send a message to the email address you provide
18<metal:rightportlets fill-slot="portlets_two">15 below. This message explains that you created a Launchpad profile
19</metal:rightportlets>16 for the email address's owner, and it will include your name and
2017 email address so that the user can contact you if they want to.
21<div metal:fill-slot="main">18 </p>
2219 <p>
23 <div metal:use-macro="context/@@launchpad_form/form">20 It will not be possible to log in with this new profile, and
2421 Launchpad will not send any other messages to it before its email
25 <p metal:fill-slot="extra_top">22 address is confirmed. The registration process must be finished by
26 We will send an email to the provided email address explaining that23 the person represented by the new profile.
27 you created a Launchpad profile for the email address' owner. This24 </p>
28 email will include your name and email address, so that the user can25 </div>
29 contact you if (s)he wants. It won't be possible to login with this26 </div>
30 new profile and we will not send any other emails to it before its27 </div>
31 email address is confirmed and the registration process finished by28 </body>
32 the person represented by that profile.
33 </p>
34
35 </div>
36</div>
37
38</body>
39</html>29</html>
4030
=== modified file 'lib/lp/registry/templates/people-newteam.pt'
--- lib/lp/registry/templates/people-newteam.pt 2009-07-17 17:59:07 +0000
+++ lib/lp/registry/templates/people-newteam.pt 2009-08-31 17:46:33 +0000
@@ -3,31 +3,20 @@
3 xmlns:tal="http://xml.zope.org/namespaces/tal"3 xmlns:tal="http://xml.zope.org/namespaces/tal"
4 xmlns:metal="http://xml.zope.org/namespaces/metal"4 xmlns:metal="http://xml.zope.org/namespaces/metal"
5 xmlns:i18n="http://xml.zope.org/namespaces/i18n"5 xmlns:i18n="http://xml.zope.org/namespaces/i18n"
6 xml:lang="en"6 metal:use-macro="view/macro:page/main_only"
7 lang="en"
8 dir="ltr"
9 metal:use-macro="context/@@main_template/master"
10 i18n:domain="launchpad"7 i18n:domain="launchpad"
11>8 >
12<body>9 <body>
1310 <div metal:fill-slot="main">
14 <div metal:fill-slot="main">11 <div metal:use-macro="context/@@launchpad_form/form">
1512 <p metal:fill-slot="extra_info" class="application-summary">
16 <h1>Register a new team</h1>
17
18 <div metal:use-macro="context/@@launchpad_form/form">
19
20 <p metal:fill-slot="extra_info">
21 Use a team to group people involved in a common task.13 Use a team to group people involved in a common task.
22 For example, a team can be the maintainer of a project,14 For example, a team can be the maintainer of a project,
23 the assignee of a bug,15 the assignee of a bug, or the editor of a package for a particular
24 or the editor of a package for a particular language.16 language.
25 </p>17 </p>
2618 </div>
19 <metal:js use-macro="context/@@+person-macros/private-team-js" />
27 </div>20 </div>
2821 </body>
29 <metal:js use-macro="context/@@+person-macros/private-team-js" />
30
31 </div>
32</body>
33</html>22</html>