Merge lp:~cprov/launchpad/bug-391810-ppa-build-deps into lp:launchpad

[Celso Providelo]

[Celso Providelo (cprov)]

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

= Summary =

This branch fixes two trivial UI bugs:

https://bugs.edge.launchpad.net/soyuz/+bug/391810
https://bugs.edge.launchpad.net/soyuz/+bug/399090

Both related with the logic used to present or ommit the PPA 'Build dependencies' section.

Now, we won't present empty sections if the user cannot change it and also allow owners to set dependencies before uploading sources.

== Tests ==

./bin/test -vv -t xx-edit-dependencies.txt

== Demo and Q/A ==

1. As no-priv, access https://launchpad.dev/~cprov/+archive/ppa and you won't see the 'Build dependencies' section.

2. As no-priv, access https://launchpad.dev/~no-priv/+archive/ppa and you will be able to set new dependencies even if the PPA is empty

= 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/soyuz/stories/ppa/xx-edit-dependencies.txt
 lib/lp/soyuz/templates/archive-index.pt
 lib/lp/soyuz/browser/archive.py
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEARECAAYFAkqJoLMACgkQ7KBXuXyZSjBJegCgnJwJ8V7HRg/qYt5G78XWkT2B
I5QAn0rLjxiyKON5oHE78eM+gPpKwSPc
=rBaW
-----END PGP SIGNATURE-----

[Eleanor Berger (intellectronica)]

review: Approve

=== modified file 'lib/lp/soyuz/browser/archive.py'
--- lib/lp/soyuz/browser/archive.py	2009-08-08 06:45:42 +0000
+++ lib/lp/soyuz/browser/archive.py	2009-08-17 18:07:34 +0000
@@ -479,6 +479,16 @@
         """Return a dict representation of the build counters."""
         return self.context.getBuildCounters()
 
+    @property
+    def show_dependencies(self):
+        """Whether or not to present the archive-dependencies section.
+
+        The dependencies section is presented if there are any dependency set
+        or if the user has permission to change it.
+        """
+        can_edit = check_permission('launchpad.Edit', self.context)
+        return can_edit or self.context.dependencies
+
 
 class ArchiveSourcePackageListViewBase(ArchiveViewBase):
     """Common features for archive views with lists of packages."""

=== modified file 'lib/lp/soyuz/stories/ppa/xx-edit-dependencies.txt'
--- lib/lp/soyuz/stories/ppa/xx-edit-dependencies.txt	2009-06-19 16:15:02 +0000
+++ lib/lp/soyuz/stories/ppa/xx-edit-dependencies.txt	2009-08-17 18:07:34 +0000
@@ -32,6 +32,29 @@
     ...
     Unauthorized: ..., 'launchpad.Edit')
 
+Users are able to change dependencies of their PPAs before uploading
+any sources.
+
+    >>> no_priv_browser = setupBrowser(
+    ...     auth='Basic [e-mail]:test')
+    >>> no_priv_browser.open("http://launchpad.dev/~no-priv/+archive/ppa")
+
+    >>> print extract_text(find_main_content(no_priv_browser.contents))
+    This archive is public
+    PPA for No Privileges Person
+    ...
+    Build dependencies: Edit dependencies
+    This PPA does not contain
+    any packages yet. Find more information about how to upload
+    packages in the PPA help page
+
+    >>> no_priv_browser.getLink('Edit dependencies').click()
+    >>> print no_priv_browser.url
+    http://launchpad.dev/~no-priv/+archive/ppa/+edit-dependencies
+
+    >>> print no_priv_browser.title
+    Edit dependencies for PPA for No Privileges Person
+
 Only Celso and an administrator can access the 'Edit dependencies'
 page for Celso's PPA.
 
@@ -41,15 +64,15 @@
     >>> cprov_browser.getLink('Edit dependencies').click()
     >>> print cprov_browser.url
     http://launchpad.dev/~cprov/+archive/ppa/+edit-dependencies
-    >>> cprov_browser.title
-    'Edit dependencies for PPA for Celso Providelo'
+    >>> print cprov_browser.title
+    Edit dependencies for PPA for Celso Providelo
 
     >>> admin_browser.open('http://launchpad.dev/~cprov/+archive/ppa')
     >>> admin_browser.getLink('Edit dependencies').click()
     >>> print admin_browser.url
     http://launchpad.dev/~cprov/+archive/ppa/+edit-dependencies
-    >>> admin_browser.title
-    'Edit dependencies for PPA for Celso Providelo'
+    >>> print admin_browser.title
+    Edit dependencies for PPA for Celso Providelo
 
 Once accessed the page provides a way to remove recorded dependencies
 via the POST form.
@@ -190,13 +213,19 @@
     >>> print_ppa_dependencies(admin_browser.contents)
     No dependencies recorded for this PPA yet.
 
-Once the dependencies are removed, the 'dependency-section' (including
-the warning message) are omitted from the PPA overview page
+Once the dependencies are removed, the 'archive-dependencies' section
+is omitted from the PPA overview page for user without permission to
+add new dependencies.
 
     >>> user_browser.open('http://launchpad.dev/~cprov/+archive/ppa')
-    >>> print_tag_with_id(user_browser.contents, 'archive-dependencies')
-    Build dependencies:
+    >>> print find_tag_by_id(
+    ...     user_browser.contents, 'archive-dependencies')
+    None
 
+    >>> anon_browser.open('http://launchpad.dev/~cprov/+archive/ppa')
+    >>> print find_tag_by_id(
+    ...     user_browser.contents, 'archive-dependencies')
+    None
 
 == Primary dependencies ==
 

=== modified file 'lib/lp/soyuz/templates/archive-index.pt'
--- lib/lp/soyuz/templates/archive-index.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/soyuz/templates/archive-index.pt	2009-08-17 18:07:34 +0000
@@ -182,7 +182,8 @@
                 </p>
             </td>
           </tr>
-          <tr id="archive-dependencies" tal:condition="archive_active">
+          <tr id="archive-dependencies"
+              tal:condition="view/show_dependencies">
             <th>Build dependencies:</th>
             <td>
               <ul>