Merge lp:~danilo/launchpad/bug-458036 into lp:launchpad

[Данило Шеган]

Allow everyone to access full template listings for ProductSeries and DistroSeries pages.

[Данило Шеган (danilo)]

= Bug #458036 =

We've limited access to +templates pages for no particular reason to
product/distro admins. There's no reason these pages couldn't be
completely public (actually, there are many reasons they should be).

== Implementation details ==

Change permissions from launchpad.Edit to zope.Public for the views,
and modify the page templates to show links appropriately (since they
can't assume someone has at least launchpad.Edit on that page anymore).

== Tests ==

bin/test -vvt distroseries-templates.txt -t productseries-templates.txt

== Demo and Q/A ==

Dev:

 Log in as <email address hidden>:test and go to:

   https://translations.launchpad.dev/evolution/trunk/
   https://translations.launchpad.dev/ubuntu/hoary/

 Look for 'full listing of templates' link that should take you to:

   https://translations.launchpad.dev/evolution/trunk/+templates
   https://translations.launchpad.dev/ubuntu/hoary/+templates

 Log in as <email address hidden>:test and go to the same pages as above.
 The only difference is what editing links are shown (i.e. just
 "Download" on Ubuntu pages, no "Administrate" on Evolution pages).

Edge:

   https://translations.edge.launchpad.net/limewire/trunk/
   https://translations.edge.launchpad.net/ubuntu/karmic/

= 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/translations/templates/object-templates.pt
  lib/lp/translations/templates/distroseries-translations.pt
  lib/lp/translations/browser/configure.zcml
  lib/lp/translations/browser/distroseries.py
  lib/lp/translations/stories/productseries/xx-productseries-templates.txt
  lib/lp/translations/templates/productseries-translations.pt
  lib/lp/translations/browser/productseries.py
  lib/lp/translations/stories/distroseries/xx-distroseries-templates.txt

[Muharem Hrnjadovic (al-maisan)]

This looks good, approved.

review: Approve

=== modified file 'lib/lp/translations/browser/configure.zcml'
--- lib/lp/translations/browser/configure.zcml	2009-09-28 09:46:35 +0000
+++ lib/lp/translations/browser/configure.zcml	2009-10-22 14:25:21 +0000
@@ -672,7 +672,7 @@
         for="lp.registry.interfaces.productseries.IProductSeries"
         name="+templates"
         class="lp.translations.browser.productseries.ProductSeriesTemplatesView"
-        permission="launchpad.Edit"
+        permission="zope.Public"
         template="../templates/object-templates.pt"
         layer="canonical.launchpad.layers.TranslationsLayer"/>
     <browser:page
@@ -943,7 +943,7 @@
     <browser:page
         for="lp.registry.interfaces.distroseries.IDistroSeries"
         class="lp.translations.browser.distroseries.DistroSeriesTemplatesView"
-        permission="launchpad.Edit"
+        permission="zope.Public"
         layer="canonical.launchpad.layers.TranslationsLayer"
         name="+templates"
         template="../templates/object-templates.pt" />

=== modified file 'lib/lp/translations/browser/distroseries.py'
--- lib/lp/translations/browser/distroseries.py	2009-09-17 14:29:22 +0000
+++ lib/lp/translations/browser/distroseries.py	2009-10-22 14:25:21 +0000
@@ -169,9 +169,6 @@
         potemplateset = getUtility(IPOTemplateSet)
         return potemplateset.getSubset(distroseries=self.context)
 
-    def can_administer(self, template):
-        return check_permission('launchpad.Admin', template)
-
 
 class DistroSeriesView(LaunchpadView, TranslationsMixin):
 

=== modified file 'lib/lp/translations/browser/productseries.py'
--- lib/lp/translations/browser/productseries.py	2009-09-17 12:45:52 +0000
+++ lib/lp/translations/browser/productseries.py	2009-10-22 14:25:21 +0000
@@ -36,7 +36,6 @@
     LaunchpadView,
     Link,
     NavigationMenu)
-from canonical.launchpad.webapp.authorization import check_permission
 from canonical.launchpad.webapp.menu import structured
 from canonical.widgets.itemswidgets import (
     LaunchpadRadioWidgetWithDescription)
@@ -489,10 +488,6 @@
         potemplateset = getUtility(IPOTemplateSet)
         return potemplateset.getSubset(productseries=self.context)
 
-    def can_administer(self, template):
-        """Can the user administer the template?"""
-        return check_permission('launchpad.Admin', template)
-
 
 class LinkTranslationsBranchView(LaunchpadEditFormView):
     """View to set the series' translations export branch."""

=== modified file 'lib/lp/translations/stories/distroseries/xx-distroseries-templates.txt'
--- lib/lp/translations/stories/distroseries/xx-distroseries-templates.txt	2009-09-14 13:54:29 +0000
+++ lib/lp/translations/stories/distroseries/xx-distroseries-templates.txt	2009-10-22 14:25:21 +0000
@@ -7,24 +7,23 @@
 
 == Getting there ==
 
-The view is only visible to the owner of the DistroSeries and administrators.
+To get to the listing of all templates, one needs to use the link
+from the distribution series translations page.
 
     >>> user_browser.open(
     ...     'http://translations.launchpad.dev/ubuntu/hoary')
-    >>> user_browser.getLink('full list of templates')
-    Traceback (most recent call last):
-    ...
-    LinkNotFoundError
-
-    >>> admin_browser.open(
-    ...     'http://translations.launchpad.dev/ubuntu/hoary')
-    >>> admin_browser.getLink('full list of templates').click()
-    >>> print admin_browser.url
+    >>> user_browser.getLink('full list of templates').click()
+    >>> print user_browser.url
     http://translations.launchpad.dev/ubuntu/hoary/+templates
 
-
 == The templates table ==
 
+Administrator can see all editing options.
+
+    >>> admin_browser.open(
+    ...     'http://translations.launchpad.dev/ubuntu/hoary')
+    >>> admin_browser.getLink('full list of templates').click()
+
 The page shows a table of all templates and links to their subpages.
 
     >>> table = find_tag_by_id(admin_browser.contents, 'templates_table')

=== modified file 'lib/lp/translations/stories/productseries/xx-productseries-templates.txt'
--- lib/lp/translations/stories/productseries/xx-productseries-templates.txt	2009-09-14 19:00:45 +0000
+++ lib/lp/translations/stories/productseries/xx-productseries-templates.txt	2009-10-22 14:25:21 +0000
@@ -7,20 +7,13 @@
 
 == Getting there ==
 
-The view is only visible to the owner of the ProductSeries and administrators.
+To get to the listing of all templates, one needs to use the link
+from the product series translations page.
 
     >>> user_browser.open(
     ...     'http://translations.launchpad.dev/evolution/trunk')
-    >>> user_browser.getLink('full list of templates')
-    Traceback (most recent call last):
-    ...
-    LinkNotFoundError
-
-    >>> browser = setupBrowser('Basic [e-mail]:test')
-    >>> browser.open(
-    ...     'http://translations.launchpad.dev/evolution/trunk')
-    >>> browser.getLink('full list of templates').click()
-    >>> print browser.url
+    >>> user_browser.getLink('full list of templates').click()
+    >>> print user_browser.url
     http://translations.launchpad.dev/evolution/trunk/+templates
 
 
@@ -28,11 +21,11 @@
 
 The page shows a table of all templates and links to their subpages.
 
-    >>> table = find_tag_by_id(browser.contents, 'templates_table')
+    >>> table = find_tag_by_id(user_browser.contents, 'templates_table')
     >>> print extract_text(table)
     Template name       Actions
-    evolution-2.2       Edit Upload Download
-    evolution-2.2-test  Edit Upload Download
+    evolution-2.2       Download
+    evolution-2.2-test  Download
 
 If an administrator views this page, links to the templates admin page are
 shown, too.

=== modified file 'lib/lp/translations/templates/distroseries-translations.pt'
--- lib/lp/translations/templates/distroseries-translations.pt	2009-09-25 16:07:06 +0000
+++ lib/lp/translations/templates/distroseries-translations.pt	2009-10-22 14:25:21 +0000
@@ -49,10 +49,10 @@
                  tal:content="string:${context/displayname} import queue">
                 import queue</a>.
             </p>
-            <p tal:condition="context/required:launchpad.Edit">
-              To manage all the translation templates in
+            <p>
+              To see all the translation templates in
               <tal:series replace="context/displayname">Hoary</tal:series>,
-              see the
+              go to the
               <a tal:attributes="href context/menu:navigation/templates/url">
                 full list of templates</a>.
             </p>

=== modified file 'lib/lp/translations/templates/object-templates.pt'
--- lib/lp/translations/templates/object-templates.pt	2009-09-25 16:07:06 +0000
+++ lib/lp/translations/templates/object-templates.pt	2009-10-22 14:25:21 +0000
@@ -75,7 +75,9 @@
             <th tal:condition="view/is_distroseries"
                 class="sourcepackage_column">Source package</th>
             <th class="template_column">Template name</th>
-            <th class="actions_column">Actions</th>
+            <th class="actions_column"
+                tal:condition="context/required:launchpad.AnyPerson">
+              Actions</th>
           </tr>
         </thead>
         <tbody>
@@ -86,21 +88,25 @@
             </td>
             <td class="template_column"><a tal:attributes="href template/fmt:url"
                    tal:content="template/name">Template name</a></td>
-            <td class="actions_column">
+            <td class="actions_column"
+                tal:condition="context/required:launchpad.AnyPerson">
             <div class="template_links">
+              <tal:maintainer condition="template/required:launchpad.Edit">
                 <a tal:attributes="href string:${template/fmt:url}/+edit;
                                    title string:Edit ${template/name}'s details">
                    <img src="/@@/edit" />&nbsp;Edit</a>
                 <a tal:attributes="href string:${template/fmt:url}/+upload;
                       title string:Upload translations to ${template/name}">
                    <img src="/@@/add" />&nbsp;Upload</a>
-                <a tal:attributes="href string:${template/fmt:url}/+export;
-                      title string:Download translations from ${template/name}">
-                   <img src="/@@/download" />&nbsp;Download</a>
-                <a tal:condition="python:view.can_administer(template)"
-                   tal:attributes="href string:${template/fmt:url}/+admin;
+              </tal:maintainer>
+              <a tal:attributes="href string:${template/fmt:url}/+export;
+                   title string:Download translations from ${template/name}">
+                <img src="/@@/download" />&nbsp;Download</a>
+              <tal:admin condition="template/required:launchpad.Admin">
+                <a tal:attributes="href string:${template/fmt:url}/+admin;
                                    title string:Administer ${template/name}">
                    <img src="/@@/edit" />&nbsp;Administer</a>
+              </tal:admin>
             </div>
             </td>
           </tr>

=== modified file 'lib/lp/translations/templates/productseries-translations.pt'
--- lib/lp/translations/templates/productseries-translations.pt	2009-09-25 17:21:00 +0000
+++ lib/lp/translations/templates/productseries-translations.pt	2009-10-22 14:25:21 +0000
@@ -66,10 +66,10 @@
               <a tal:attributes="href context/menu:navigation/imports/url">
                 import queue</a>.
             </p>
-            <p tal:condition="context/required:launchpad.Edit">
-              To manage all the translation templates in
+            <p>
+              To see all the translation templates in
               <tal:series replace="context/displayname">trunk</tal:series>,
-              see the
+              go to the
               <a tal:attributes="href context/menu:navigation/templates/url">
                 full list of templates</a>.
             </p>