Merge lp:~julian-edwards/launchpad/enable-publish-ui-bug-520520 into lp:launchpad

[Julian Edwards]

Enable the archive +edit form to set the 'publish' flag

[Julian Edwards (julian-edwards)]

= Summary =
Enable the archive +edit form to set the 'publish' flag

== Proposed fix ==
Simple addition to the form fields on the +edit page.

== Pre-implementation notes ==

== Implementation details ==
It's trivial!

== Tests ==
bin/test -cvvt xx-ppa-workflow.txt

== Demo and Q/A ==

= Launchpad lint =

This lint is all crack. I'm ignoring it. We really need to fix the linter.

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-ppa-workflow.txt
  lib/lp/soyuz/interfaces/archive.py
  lib/lp/soyuz/configure.zcml
  lib/lp/soyuz/browser/archive.py

== Pylint notices ==

lib/lp/soyuz/interfaces/archive.py
    40: [F0401] Unable to import 'lazr.enum' (No module named enum)
    53: [F0401] Unable to import 'lazr.restful.declarations' (No module named
restful)
    59: [F0401] Unable to import 'lazr.restful.fields' (No module named
restful)
    444: [C0322, IArchivePublic.newPackagesetUploader] Operator not preceded
by a space

    packageset=Reference(
    ^
    Interface, title=_("Package set"), required=True),
    explicit=Bool(
    title=_("Explicit"), required=False))

    @export_factory_operation(Interface, [])
    def newPackagesetUploader(person, packageset, explicit=False):
    468: [C0322, IArchivePublic.getUploadersForPackageset] Operator not
preceded by a space
    packageset=Reference(
    ^
    Interface, title=_("Package set"), required=True),
    direct_permissions=Bool(
    title=_("Ignore package set hierarchy"), required=False))

    @operation_returns_collection_of(Interface)
    @export_read_operation()
    def getUploadersForPackageset(packageset, direct_permissions=True):
    490: [C0322, IArchivePublic.deletePackagesetUploader] Operator not
preceded by a space

    packageset=Reference(
    ^
    Interface, title=_("Package set"), required=True),
    explicit=Bool(
    title=_("Explicit"), required=False))
    @export_write_operation()
    def deletePackagesetUploader(person, packageset, explicit=False):
    525: [C0322, IArchivePublic.getPackagesetsForSourceUploader] Operator not
preceded by a space
    person=Reference(schema=IPerson))
    ^

    @operation_returns_collection_of(Interface)
    @export_read_operation()
    def getPackagesetsForSourceUploader(sourcepackagename, person):
    554: [C0322, IArchivePublic.getPackagesetsForSource] Operator not preceded
by a space
    direct_permissions=Bool(
    ^
    title=_("Ignore package set hierarchy"), required=False))

    @operation_returns_collection_of(Interface)
    @export_read_operation()
    def getPackagesetsForSource(
    sourcepackagename, direct_permissions=True):
    583: [C0322, IArchivePublic.isSourceUploadAllowed] Operator not preceded
by a space
    title=_("Source package name"), required=True),
    ^
    person=Reference(schema=IPerson),
    distroseries=Reference(

    Interface,
    title=_("The distro series"), required=False))
    @export_read_operation()
    def isSourceUploadAllowed(sourcepackagename, person, distroseries=None):
    654: [C0322, IArch...

[Michael Nelson (michael.nelson)]

Great, thanks Julian! (we mentioned just the ordering of the set_attributes).

review: Approve (code)

=== modified file 'lib/lp/soyuz/browser/archive.py'
--- lib/lp/soyuz/browser/archive.py	2010-02-11 13:26:21 +0000
+++ lib/lp/soyuz/browser/archive.py	2010-02-25 17:08:19 +0000
@@ -1781,7 +1781,7 @@
 
 class ArchiveEditView(BaseArchiveEditView):
 
-    field_names = ['displayname', 'description', 'enabled']
+    field_names = ['displayname', 'description', 'enabled', 'publish']
     custom_widget(
         'description', TextAreaWidget, height=10, width=30)
 
 
=== modified file 'lib/lp/soyuz/configure.zcml'
--- lib/lp/soyuz/configure.zcml	2010-02-09 17:02:18 +0000
+++ lib/lp/soyuz/configure.zcml	2010-02-25 17:08:19 +0000
@@ -415,7 +415,7 @@
         <require
             permission="launchpad.Edit"
             interface="lp.soyuz.interfaces.archive.IArchiveEdit"
-            set_attributes="description displayname"/>
+            set_attributes="description displayname publish"/>
         <require
             permission="launchpad.Commercial"
             set_attributes="authorized_size buildd_secret
 
=== modified file 'lib/lp/soyuz/interfaces/archive.py'
--- lib/lp/soyuz/interfaces/archive.py	2010-02-18 17:05:50 +0000
+++ lib/lp/soyuz/interfaces/archive.py	2010-02-25 17:08:19 +0000
@@ -145,10 +145,6 @@
         title=_("Enabled"), required=False,
         description=_("Whether the archive is enabled or not."))
 
-    publish = Bool(
-        title=_("Publish"), required=False,
-        description=_("Whether the archive is to be published or not."))
-
     # This is redefined from IPrivacy.private because the attribute is
     # read-only. The value is guarded by a validator.
     private = exported(
@@ -993,6 +989,10 @@
 class IArchiveEdit(Interface):
     """Archive interface for operations restricted by edit privilege."""
 
+    publish = Bool(
+        title=_("Publish"), required=False,
+        description=_("Whether the archive is to be published or not."))
+
     @operation_parameters(
         person=Reference(schema=IPerson),
         source_package_name=TextLine(
 
=== modified file 'lib/lp/soyuz/stories/ppa/xx-ppa-workflow.txt'
--- lib/lp/soyuz/stories/ppa/xx-ppa-workflow.txt	2009-12-14 12:47:54 +0000
+++ lib/lp/soyuz/stories/ppa/xx-ppa-workflow.txt	2010-02-25 17:08:19 +0000
@@ -714,27 +714,36 @@
 == Enabling or disabling of PPAs by the owner ==
 
 Users with 'launchpad.Edit' permission for a PPA may disable or enable it.
+They may also change whether the PPA is published to disk or not.
 
     >>> 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.
+Initially, the PPA is enabled and publishes.
 
     >>> print no_priv_browser.getControl(name='field.enabled').value
     True
+    >>> print no_priv_browser.getControl(name='field.publish').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(name='field.publish').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.
+Going back to the edit page, we can see the publish flag was cleared:
 
     >>> no_priv_browser.open("http://launchpad.dev/~no-priv/+archive/ppa/+edit")
+    >>> print no_priv_browser.getControl(name='field.publish').value
+    False
+
+Once we re-enable the PPA the "disabled" warning message will be gone.
+
     >>> print no_priv_browser.getControl(name='field.enabled').value
     False
 
@@ -743,3 +752,5 @@
     >>> (first_tag_by_class(no_priv_browser.contents, 'warning message')
     ...  is None)
     True
+
+