Merge lp:~sinzui/launchpad/mental-health-0 into lp:launchpad

[Curtis Hovey]

This is my branch to fix some trivial issues to recover my mind.

    lp:~sinzui/launchpad/mental-health-0
    Diff size: 265
    Launchpad bug: https://bugs.launchpad.net/bugs/588820
                   https://bugs.launchpad.net/bugs/583311
                   https://bugs.launchpad.net/bugs/401923
    Test command: ./bin/test -vv \
        -t TestProductLicenseMixin -t stories/mailinglists/subscriptions
        -t xx-official-bug-tags.txt -t xx-distro-guided-filebug-tags.txt
        -t xx-filebug-tags.txt
    Pre-implementation: no one.
    Target release: 10.06

Fix some trivial issues to recover my mind
-------------------------------------------

Bug #588820 [licence emails leave a bad timestamp on the whiteboard]
    The whiteboard date is wrong, minutes are shown where a month is
    expected.

Bug #583311 [Better wording for team mailing list section]
    The wording implies that the team does not have a mailing list, but
    the team may have one hosted else where, like lists.ubuntu.com/

Bug #401923 [advanced search pop up help for tags doesn't work if you are
    in a different domain]
    Help fails to load on
    https://edge.launchpad.net/launchpad/+bugs?advanced=1
    because the bugs domain was not specified in the help link. Help is
    specific to domains, so the domain must be used if the help is used
    by more than one domain.

Rules
-----

Bug #588820 [licence emails leave a bad timestamp on the whiteboard]
    * Extract the date formatting rule so that it can be tested.
    * use mm instead of MM to insert the month.

Bug #583311 [Better wording for team mailing list section]
    * Use "This team does not use Launchpad to host a mailing list." to
      make it clear to used who view the team page that Launchpad does
      not know about the mailing list. We still want to show a message so that
      users do not search Launchpad for information that does not exist. This
      may prevent novice admins from trying to register an ubuntu list from
      Launchpad (We see this mistake every few months.)

Bug #401923 [advanced search pop up help for tags doesn't work if you are
    in a different domain]
    * Extract the common bug tag testing pattern to a test helper so that
      only one rule needs updating for the url change.
    * Include the bugs domain in the tags help link. Tags is the only
      part of the form that uses a help link, but it the bugs rooturl should
      be available to any part of the form.

QA
--

Bug #588820 [license emails leave a bad timestamp on the whiteboard]
    * During project review
    * Verify that the "I don't know" projects have a sane date.

Bug #583311 [Better wording for team mailing list section]
    * Visit https://launchpad.net/~ubuntu-l10n-es
    * Verify the page states:
      "This team does not use Launchpad to host a mailing list."

Bug #401923 [advanced search pop up help for tags doesn't work if you are
    in a different domain]
    * Visit https://edge.launchpad.net/launchpad/+bugs?advanced=1
    * Verify that the tag help displays when accessed.

Lint
----

Linting changed files:
  lib/lp/bugs/stories/bug-tags/xx-official-bug-tags.txt
  lib/lp/bugs/stories/guided-filebug/xx-distro-guided-filebug-tags.txt
  lib/lp/bugs/stories/guided-filebug/xx-filebug-tags.txt
  lib/lp/bugs/templates/bugtask-macros-tableview.pt
  lib/lp/bugs/tests/bug.py
  lib/lp/registry/browser/person.py
  lib/lp/registry/browser/product.py
  lib/lp/registry/browser/tests/test_product.py
  lib/lp/registry/stories/mailinglists/subscriptions.txt
  lib/lp/registry/templates/team-mailinglist-subscribers.pt
  lib/lp/registry/templates/team-portlet-mailinglist.pt

Test
----

    * lib/lp/bugs/stories/bug-tags/xx-official-bug-tags.txt
    * lib/lp/bugs/stories/guided-filebug/xx-distro-guided-filebug-tags.txt
    * lib/lp/bugs/stories/guided-filebug/xx-filebug-tags.txt
      * Extracted the common pattern to a helper. Updated two tests to
        show that the tag are unofficial.

    * lib/lp/registry/browser/tests/test_product.py
      * Added a test to verify the date is formatted with the month.

    * lib/lp/registry/stories/mailinglists/subscriptions.txt
      * Updated the test to verify that that the team does not have
        a Launchpad hosted mailing list.

Implementation
--------------

    * lib/lp/bugs/templates/bugtask-macros-tableview.pt
      * Added the bugs vhost to the tag help link.

    * lib/lp/bugs/tests/bug.py
      * Added a new test helper based on the common pattern in story tests.
        Changed the help link guard to work with the bugs domain.

    * lib/lp/registry/browser/person.py
    * lib/lp/registry/templates/team-mailinglist-subscribers.pt
    * lib/lp/registry/templates/team-portlet-mailinglist.pt
      * Clarified the no mailing list message.

    * lib/lp/registry/browser/product.py
      * Extracted the date format rules to a testable method, then fixed
        the format string to use the month.

[Brad Crittenden (bac)]

You are my hero. Very nice fixes all.

review: Approve

=== modified file 'lib/canonical/launchpad/webapp/configure.zcml'
--- lib/canonical/launchpad/webapp/configure.zcml	2010-05-27 22:18:16 +0000
+++ lib/canonical/launchpad/webapp/configure.zcml	2010-06-05 05:08:27 +0000
@@ -469,6 +469,12 @@
         name="fmt"
         />
     <adapter
+        for="lp.code.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuild"
+        provides="zope.traversing.interfaces.IPathAdapter"
+        factory="canonical.launchpad.webapp.tales.SourcePackageRecipeBuildFormatterAPI"
+        name="fmt"
+        />
+    <adapter
         for="canonical.launchpad.interfaces.ISpecification"
         provides="zope.traversing.interfaces.IPathAdapter"
         factory="canonical.launchpad.webapp.tales.SpecificationFormatterAPI"

=== modified file 'lib/canonical/launchpad/webapp/tales.py'
--- lib/canonical/launchpad/webapp/tales.py	2010-05-27 22:18:16 +0000
+++ lib/canonical/launchpad/webapp/tales.py	2010-06-05 05:08:27 +0000
@@ -1606,6 +1606,17 @@
                 'owner': self._context.owner.displayname}
 
 
+class SourcePackageRecipeBuildFormatterAPI(CustomizableFormatter):
+    """Adapter providing fmt support for ISourcePackageRecipe objects."""
+
+    _link_summary_template = '%(name)s recipe build [%(owner)s/%(archive)s]'
+
+    def _link_summary_values(self):
+        return {'name': self._context.recipe.base_branch.unique_name,
+                'owner': self._context.archive.owner.name,
+                'archive': self._context.archive.name}
+
+
 class SpecificationFormatterAPI(CustomizableFormatter):
     """Adapter providing fmt support for Specification objects"""
 

=== modified file 'lib/lp/bugs/stories/bug-tags/xx-official-bug-tags.txt'
--- lib/lp/bugs/stories/bug-tags/xx-official-bug-tags.txt	2010-04-29 15:24:12 +0000
+++ lib/lp/bugs/stories/bug-tags/xx-official-bug-tags.txt	2010-06-05 05:08:27 +0000
@@ -60,6 +60,7 @@
 
     >>> from canonical.launchpad.ftests import login, logout
     >>> from canonical.launchpad.webapp import canonical_url
+    >>> from lp.bugs.tests.bug import print_bug_tag_anchors
     >>> import transaction
     >>> login('[e-mail]')
     >>> gfoobar = factory.makeProduct(name='gfoobar')
@@ -72,9 +73,7 @@
 
     >>> browser.open(gfoobar_bug_url)
     >>> tags_div = find_tag_by_id(browser.contents, 'bug-tags')
-    >>> for anchor in tags_div.findAll('a'):
-    ...     if anchor['href'] != '+edit'  and anchor['href'] != '/+help/tag-help.html':
-    ...         print anchor['class'], anchor.contents[0]
+    >>> print_bug_tag_anchors(tags_div.findAll('a'))
     official-tag alpha
     official-tag charlie
     unofficial-tag bravo

=== modified file 'lib/lp/bugs/stories/guided-filebug/xx-distro-guided-filebug-tags.txt'
--- lib/lp/bugs/stories/guided-filebug/xx-distro-guided-filebug-tags.txt	2010-04-29 15:24:12 +0000
+++ lib/lp/bugs/stories/guided-filebug/xx-distro-guided-filebug-tags.txt	2010-06-05 05:08:27 +0000
@@ -21,6 +21,8 @@
 
 After submitting the bug, the tags are added to the bug.
 
+    >>> from lp.bugs.tests.bug import print_bug_tag_anchors
+
     >>> user_browser.getControl('Further information').value = 'Thanks.'
     >>> user_browser.getControl('Submit Bug Report').click()
 
@@ -28,7 +30,5 @@
     'http://bugs.launchpad.dev/ubuntu/+bug/...'
 
     >>> tags_div = find_tag_by_id(user_browser.contents, 'bug-tags')
-    >>> for a_tag in tags_div('a'):
-    ...   if a_tag['href'] != '+edit' and a_tag['href'] != '/+help/tag-help.html':
-    ...       print a_tag.renderContents()
-    new-package
+    >>> print_bug_tag_anchors(tags_div('a'))
+    unofficial-tag new-package

=== modified file 'lib/lp/bugs/stories/guided-filebug/xx-filebug-tags.txt'
--- lib/lp/bugs/stories/guided-filebug/xx-filebug-tags.txt	2010-04-29 15:24:12 +0000
+++ lib/lp/bugs/stories/guided-filebug/xx-filebug-tags.txt	2010-06-05 05:08:27 +0000
@@ -6,6 +6,8 @@
 On the normal +filebug page, tags can be added to the bug as the bug
 is being filed.
 
+    >>> from lp.bugs.tests.bug import print_bug_tag_anchors
+
     >>> user_browser.open(
     ...     'http://bugs.launchpad.dev/firefox/+filebug')
     >>> user_browser.getControl('Summary').value = "Bug with tags"
@@ -18,11 +20,9 @@
     'http://bugs.launchpad.dev/firefox/+bug/...'
 
     >>> tags_div = find_tag_by_id(user_browser.contents, 'bug-tags')
-    >>> for a_tag in tags_div('a'):
-    ...   if a_tag['href'] != '+edit' and a_tag['href'] != '/+help/tag-help.html':
-    ...      print a_tag.renderContents()
-    bar
-    foo
+    >>> print_bug_tag_anchors(tags_div('a'))
+    unofficial-tag bar
+    unofficial-tag foo
 
 
 == Pre-populating the tags field ==

=== modified file 'lib/lp/bugs/templates/bugtask-macros-tableview.pt'
--- lib/lp/bugs/templates/bugtask-macros-tableview.pt	2010-03-04 20:53:52 +0000
+++ lib/lp/bugs/templates/bugtask-macros-tableview.pt	2010-06-05 05:08:27 +0000
@@ -234,7 +234,8 @@
 </metal:header>
 
 
-<metal:advanced_search_form define-macro="advanced_search_form">
+<metal:advanced_search_form define-macro="advanced_search_form"
+  tal:define="bugs_rooturl modules/canonical.launchpad.webapp.vhosts/allvhosts/configs/bugs/rooturl">
 
   <form class="long" name="search" method="get" action="">
     <span tal:condition="view/current_package|nothing">
@@ -527,7 +528,7 @@
                          tal:content="structure view/widgets/tag/label">
                     Tag
                   </label>: <input tal:replace="structure view/widgets/tag" />
-                  <a href="/+help/tag-search.html"
+                  <a tal:attributes="href string:${bugs_rooturl}/+help/tag-search.html"
                       target="help">Tag search help</a>
                   <div
                     tal:condition="error"

=== modified file 'lib/lp/bugs/tests/bug.py'
--- lib/lp/bugs/tests/bug.py	2010-02-26 09:54:20 +0000
+++ lib/lp/bugs/tests/bug.py	2010-06-05 05:08:27 +0000
@@ -321,3 +321,11 @@
         '/%s/+bugtarget-portlet-bugfilters-stats' % target)
     table = BeautifulSoup('<table>%s</table>' % browser.contents)
     print_table(table)
+
+
+def print_bug_tag_anchors(anchors):
+    """The the bug tags in the iterable of anchors."""
+    for anchor in anchors:
+        href = anchor['href']
+        if href != '+edit' and '/+help/tag-help.html' not in href:
+            print anchor['class'], anchor.contents[0]

=== modified file 'lib/lp/registry/browser/person.py'
--- lib/lp/registry/browser/person.py	2010-05-28 23:06:25 +0000
+++ lib/lp/registry/browser/person.py	2010-06-05 05:08:27 +0000
@@ -1942,7 +1942,7 @@
             extra_params=critical_bugs_params)
 
     def getHighBugsURL(self, distributionsourcepackage):
-        """Return URL for high importance bugs on distributionsourcepackage."""
+        """Return URL for high bugs on distributionsourcepackage."""
         high_bugs_params = {
             'field.status': [], 'field.importance': "High"}
 
@@ -2503,7 +2503,7 @@
         if self.user == self.context:
             return 'Your Launchpad Karma'
         else:
-            return 'Launchpad Karma for %s' %  self.context.displayname
+            return 'Launchpad Karma for %s' % self.context.displayname
 
     @cachedproperty
     def has_karma(self):
@@ -3208,7 +3208,7 @@
         mailing_list = self.context.mailing_list
         if mailing_list is None:
             raise UnexpectedFormData(
-                _("This team does not have a mailing list."))
+                _("This team does not use Launchpad to host a mailing list."))
         if not self.user:
             raise Unauthorized(
                 _("You must be logged in to unsubscribe."))

=== modified file 'lib/lp/registry/browser/product.py'
--- lib/lp/registry/browser/product.py	2010-05-24 04:55:08 +0000
+++ lib/lp/registry/browser/product.py	2010-06-05 05:08:27 +0000
@@ -292,7 +292,7 @@
 
     def _addLicenseChangeToReviewWhiteboard(self):
         """Update the whiteboard for the reviewer's benefit."""
-        now = datetime.now(tz=pytz.UTC).strftime('%Y-%M-%d')
+        now = self._formatDate()
         whiteboard = 'User notified of license policy on %s.' % now
         naked_product = removeSecurityProxy(self.product)
         if naked_product.reviewer_whiteboard is None:
@@ -300,6 +300,12 @@
         else:
             naked_product.reviewer_whiteboard += '\n' + whiteboard
 
+    def _formatDate(self, now=None):
+        """Return the date formatted for messages."""
+        if now is None:
+            now = datetime.now(tz=pytz.UTC)
+        return now.strftime('%Y-%m-%d')
+
 
 class ProductFacets(QuestionTargetFacetMixin, StandardLaunchpadFacets):
     """The links that will appear in the facet menu for an IProduct."""

=== modified file 'lib/lp/registry/browser/tests/test_product.py'
--- lib/lp/registry/browser/tests/test_product.py	2010-05-11 20:01:34 +0000
+++ lib/lp/registry/browser/tests/test_product.py	2010-06-05 05:08:27 +0000
@@ -5,8 +5,11 @@
 
 __metaclass__ = type
 
+import datetime
 import unittest
 
+import pytz
+
 from zope.security.proxy import removeSecurityProxy
 
 from canonical.testing.layers import DatabaseFunctionalLayer
@@ -102,6 +105,12 @@
         self.verify_user_email(notifications.pop())
         self.verify_commercial_email(notifications.pop())
 
+    def test__formatDate(self):
+        # Verify the date format.
+        now = datetime.datetime(2005, 6, 15, 0, 0, 0, 0, pytz.UTC)
+        result = self.view._formatDate(now)
+        self.assertEqual('2005-06-15', result)
+
 
 def test_suite():
     return unittest.TestLoader().loadTestsFromName(__name__)

=== modified file 'lib/lp/registry/stories/mailinglists/subscriptions.txt'
--- lib/lp/registry/stories/mailinglists/subscriptions.txt	2010-02-26 00:03:09 +0000
+++ lib/lp/registry/stories/mailinglists/subscriptions.txt	2010-06-05 05:08:27 +0000
@@ -372,7 +372,7 @@
     >>> print extract_text(
     ...     find_portlet(browser.contents, 'Mailing list'))
     Mailing list
-    This team does not have a mailing list.
+    This team does not use Launchpad to host a mailing list.
     Create a mailing list
 
     >>> browser.getLink('Subscribe')

=== modified file 'lib/lp/registry/templates/team-mailinglist-subscribers.pt'
--- lib/lp/registry/templates/team-mailinglist-subscribers.pt	2009-09-14 01:28:41 +0000
+++ lib/lp/registry/templates/team-mailinglist-subscribers.pt	2010-06-05 05:08:27 +0000
@@ -25,8 +25,13 @@
         </tal:no-subscribers>
       </tal:has-mailinglist>
       <tal:no_mailing_list condition="not: context/mailing_list">
-        <p>This team does not have a mailing list.</p>
-        <p><a href="+mailinglist">Configure</a> the team's mailing list.</p>
+        <p>This team does not use Launchpad to host a mailing list.</p>
+        <ul class="horizontal">
+          <li>
+            <tal:configure_mailing_list
+              replace="structure context/menu:overview/configure_mailing_list/fmt:link-icon" />
+          </li>
+        </ul>
       </tal:no_mailing_list>
     </div>
 

=== modified file 'lib/lp/registry/templates/team-portlet-mailinglist.pt'
--- lib/lp/registry/templates/team-portlet-mailinglist.pt	2010-02-25 23:29:29 +0000
+++ lib/lp/registry/templates/team-portlet-mailinglist.pt	2010-06-05 05:08:27 +0000
@@ -41,15 +41,19 @@
               >View subscribers</a>
     </div>
     <div tal:condition="not: view/archive_url">
-      This team does not have a mailing list.
-    </div>
-    <div tal:condition="context/menu:overview/configure_mailing_list/enabled">
-      <tal:configure_mailing_list
-        replace="structure context/menu:overview/configure_mailing_list/fmt:link-icon" />
-      &nbsp;
-      <tal:moderate_mailing_list
-        replace="structure context/menu:overview/moderate_mailing_list/fmt:link-icon" />
-    </div>
+      This team does not use Launchpad to host a mailing list.
+    </div>
+    <ul class="horizontal"
+      tal:condition="context/menu:overview/configure_mailing_list/enabled">
+      <li>
+        <tal:configure_mailing_list
+          replace="structure context/menu:overview/configure_mailing_list/fmt:link-icon" />
+      </li>
+      <li>
+        <tal:moderate_mailing_list
+          replace="structure context/menu:overview/moderate_mailing_list/fmt:link-icon" />
+      </li>
+    </ul>
   </div>
 </div>
 </tal:root>

=== modified file 'lib/lp/soyuz/templates/build-index.pt'
--- lib/lp/soyuz/templates/build-index.pt	2010-06-04 13:54:54 +0000
+++ lib/lp/soyuz/templates/build-index.pt	2010-06-05 05:08:27 +0000
@@ -79,7 +79,7 @@
           </dd>
       </dl>
       <dl
-          tal:define="spr context/sourcepackagerelease"
+          tal:define="spr context/source_package_release"
           tal:condition="spr/source_package_recipe_build">
         <dt>Source package recipe build:</dt>
         <dd tal:content="structure spr/source_package_recipe_build/fmt:link">