Merge lp:~bac/launchpad/bug-430748-team-mailinglist into lp:launchpad

[Brad Crittenden]

[Brad Crittenden (bac)]

= Summary =

Fix bug 430784 - convert team-mailinglist.pt to UI 3.0.

== Proposed fix ==

JFDI

== Pre-implementation notes ==

n/a

== Implementation details ==

Simple fix to the template and fix the tests.

== Tests ==

bin/test -vvm lp.registry

== Demo and Q/A ==

The template and view are multi-modal. The same page is used to apply for a mailing
list and configure an existing one.

All of these views are available as screenshots at:
http://people.canonical.com/~bac/bug-430748-team-mailinglist/

* Run 'make run_all'
* As mark, go to https://launchpad.dev/~ubuntu-team
* Click on 'Create a mailing list'
* Apply
* Go to https://launchpad.dev/+mailinglists and approve the list
* Return to https://launchpad.dev/~ubuntu-team and click on 'Configure mailing list'
* You'll now see one of the other views where the admin can set the welcome message.
* Another view is for a rejected team. Apply, reject, look.

= Launchpad lint =

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

Linting changed files:
  lib/lp/registry/templates/team-mailinglist.pt
  lib/lp/registry/stories/mailinglists/lifecycle.txt
  lib/lp/registry/stories/mailinglists/admin-approval.txt

[Edwin Grubbs (edwin-grubbs)]

Hi Brad,

This branch looks good. I just have one thing that I stumbled upon when looking at your changes that would make a good drive-by cleanup.

merge-approved

Can you make this change?

        <browser:page
            for="lp.registry.interfaces.person.ITeam"
            permission="launchpad.MailingListManager"
- class="canonical.launchpad.browser.TeamMailingListConfigurationView"
+ class="lp.registry.browser.team.TeamMailingListConfigurationView"
            name="+mailinglist"
            template="../templates/team-mailinglist.pt"/>

-Edwin

review: Approve (code)

[Brad Crittenden (bac)]

I made the change and the others related to the team.
http://pastebin.ubuntu.com/272435/

=== modified file 'lib/lp/registry/stories/mailinglists/admin-approval.txt'
--- lib/lp/registry/stories/mailinglists/admin-approval.txt	2009-09-11 00:24:50 +0000
+++ lib/lp/registry/stories/mailinglists/admin-approval.txt	2009-09-16 19:37:35 +0000
@@ -157,7 +157,9 @@
 The Test Two mailing list has been declined so Mailman will not create it.
 
     >>> user_browser.open('http://launchpad.dev/~test-two/+mailinglist')
-    >>> print extract_text(find_main_content(user_browser.contents))
+    >>> print extract_text(
+    ...     find_tag_by_id(user_browser.contents,
+    ...                    'mailing_list_status_message'))
     The application for this team's mailing list has been declined.
     Please contact a Launchpad administrator for further assistance.
 

=== modified file 'lib/lp/registry/stories/mailinglists/lifecycle.txt'
--- lib/lp/registry/stories/mailinglists/lifecycle.txt	2009-08-31 12:01:46 +0000
+++ lib/lp/registry/stories/mailinglists/lifecycle.txt	2009-09-16 19:37:35 +0000
@@ -13,8 +13,9 @@
     >>> browser = setupBrowser(auth='Basic [e-mail]:test')
     >>> browser.open('http://launchpad.dev/~landscape-developers')
     >>> browser.getLink(url='+mailinglist').click()
-    >>> browser.title
-    'Configure mailing list'
+    >>> from canonical.launchpad.helpers import backslashreplace
+    >>> print backslashreplace(browser.title)
+    +mailinglist : \u201cLandscape Developers\u201d team
 
     >>> browser.getControl('Apply for Mailing List').click()
     >>> browser.title
@@ -243,6 +244,7 @@
 
 The contact address is now set to the mailing list address.
 
+    >>> browser.goBack()
     >>> browser.getLink(url='+contactaddress').click()
     >>> control = browser.getControl(name='field.contact_method')
     >>> [strip_label(label) for label in control.displayValue]

=== modified file 'lib/lp/registry/templates/team-mailinglist.pt'
--- lib/lp/registry/templates/team-mailinglist.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/registry/templates/team-mailinglist.pt	2009-09-16 19:37:35 +0000
@@ -3,10 +3,9 @@
   xmlns:tal="http://xml.zope.org/namespaces/tal"
   xmlns:metal="http://xml.zope.org/namespaces/metal"
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  xml:lang="en"
-  lang="en"
-  metal:use-macro="context/@@main_template/master"
-  i18n:domain="launchpad">
+  metal:use-macro="view/macro:page/main_only"
+  i18n:domain="launchpad"
+>
 
 <body>