Merge lp:~al-maisan/launchpad/disable-ppa-495975 into lp:launchpad/db-devel

[Muharem Hrnjadovic]

[Muharem Hrnjadovic (al-maisan)]

Hello there,

this is a simple branch that boosts the usability of PPAs quite a bit by
allowing users with edit permissions for a PPA to disable and enable the
latter.

Tests to run:

    bin/test -vv -t ppa -t archive

No pertinent "make lint" errors or warnings.

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

Looks good, though this is the kind of thing I'd rather see during regular development: it's a new feature. Accepted solely on the basis that LOSAs would very much like it, and it's a very simple change.

It's conditional on doing QA on dogfood and getting a regular review before landing it.

review: Approve (release-critical)

[Julian Edwards (julian-edwards)]

This is fine. Muharem, please QA on dogfood before landing, and also ensure that the old +admin form still works to enable/disable.

Cheers.

review: Approve (code)

[Muharem Hrnjadovic (al-maisan)]

Julian Edwards wrote:
> Review: Approve code
> This is fine. Muharem, please QA on dogfood before landing, and also
> ensure that the old +admin form still works to enable/disable.

Hello,

thanks for the review, I tried the patch on dogfood and it works as
expected, I

  - first disabled/re-enabled one of my PPAs
    (https://dogfood.launchpad.net/~al-maisan/+archive/merges)
  - then added myself to the https://dogfood.launchpad.net/~admins group
    and disabled/re-enabled
    https://dogfood.launchpad.net/~cprov/+archive/ppa via "Administer
    archive"

Best regards

--
Muharem Hrnjadovic <email address hidden>
Public key id : B2BBFCFC
Key fingerprint : A5A3 CC67 2B87 D641 103F 5602 219F 6B60 B2BB FCFC

=== modified file 'lib/lp/soyuz/browser/archive.py'
--- lib/lp/soyuz/browser/archive.py	2009-11-06 21:06:38 +0000
+++ lib/lp/soyuz/browser/archive.py	2009-12-14 12:59:13 +0000
@@ -1782,7 +1782,7 @@
 
 class ArchiveEditView(BaseArchiveEditView):
 
-    field_names = ['displayname', 'description']
+    field_names = ['displayname', 'description', 'enabled']
     custom_widget(
         'description', TextAreaWidget, height=10, width=30)
 

=== modified file 'lib/lp/soyuz/configure.zcml'
--- lib/lp/soyuz/configure.zcml	2009-12-01 08:43:43 +0000
+++ lib/lp/soyuz/configure.zcml	2009-12-14 12:59:13 +0000
@@ -395,11 +395,11 @@
         <require
             permission="launchpad.Edit"
             interface="lp.soyuz.interfaces.archive.IArchiveEdit"
-            set_attributes="description displayname"/>
+            set_attributes="description displayname enabled"/>
         <require
             permission="launchpad.Commercial"
             set_attributes="authorized_size buildd_secret
-                            enabled external_dependencies private
+                            external_dependencies private
                             require_virtualized relative_build_score "/>
         <require
             permission="launchpad.Admin"

=== modified file 'lib/lp/soyuz/stories/ppa/xx-ppa-workflow.txt'
--- lib/lp/soyuz/stories/ppa/xx-ppa-workflow.txt	2009-10-14 00:51:54 +0000
+++ lib/lp/soyuz/stories/ppa/xx-ppa-workflow.txt	2009-12-14 12:59:13 +0000
@@ -710,3 +710,36 @@
     ...
     Unauthorized: ...
 
+
+== Enabling or disabling of PPAs by the owner ==
+
+Users with 'launchpad.Edit' permission for a PPA may disable or enable it.
+
+    >>> no_priv_browser = setupBrowser(
+    ...     auth='Basic [e-mail]:test')
+    >>> no_priv_browser.open("http://launchpad.dev/~no-priv/+archive/ppa/+edit")
+
+Initially, the PPA is enabled.
+
+    >>> print no_priv_browser.getControl(name='field.enabled').value
+    True
+
+After disabling the PPA a warning message is displayed on its page.
+
+    >>> no_priv_browser.getControl(name='field.enabled').value = False
+    >>> no_priv_browser.getControl('Save').click()
+    >>> print extract_text(
+    ...     first_tag_by_class(no_priv_browser.contents, 'warning message'))
+    This archive has been disabled.
+
+Once we re-enable the PPA the warning message is gone.
+
+    >>> no_priv_browser.open("http://launchpad.dev/~no-priv/+archive/ppa/+edit")
+    >>> print no_priv_browser.getControl(name='field.enabled').value
+    False
+
+    >>> no_priv_browser.getControl(name='field.enabled').value = True
+    >>> no_priv_browser.getControl('Save').click()
+    >>> (first_tag_by_class(no_priv_browser.contents, 'warning message')
+    ...  is None)
+    True