Merge lp:~henninge/launchpad/bug-422466-status-picker into lp:launchpad/db-devel

[Henning Eggers]

Added a nice status picker to the import queue page. And colours!

[Henning Eggers (henninge)]

= Bug 422466 =

This completes my work from the LAZR-JS sprint. The setting of statuses on the translation import queue page used to be one big form with a series of drop-down boxes. The statuses were changed by clicking on a submit button at the bottom of the page.

This branch adds a choice picker for each entry in the queue which looks much better and allow for each status to be set separately.

== Implementation details ==

This solution makes use of the "disabled_items" feature of the choice edit widget instead of limiting the choices. I removed one choice from "canSetStatus" that proved problematic in practice.

== Screenshots ==

The "degraded" shots give an impression of the "before" state, too.

http://people.canonical.com/~henninge/screenshots/status-picker-degraded.png
http://people.canonical.com/~henninge/screenshots/status-picker-degraded-no-priv.png
http://people.canonical.com/~henninge/screenshots/status-picker-after.png
http://people.canonical.com/~henninge/screenshots/status-picker-after-open.png
http://people.canonical.com/~henninge/screenshots/status-picker-after-no-priv.png
http://people.canonical.com/~henninge/screenshots/status-picker-after-no-priv-open.png

== Tests ==

Windmill test still to come.

[Curtis Hovey (sinzui)]

Hi Henning.

I really the addition of the picker, and your considerations of how to deal with unavailable status. I have a few concerns that this addition has exacerbated. The edit/info Translation Queue Entry links looks like they is separated from the content. With the addition of inline editing, the layout looks like a mistake.

I think the icon to edit the translation queue entry must be closer to the parts it modifies. Consider creating the link twice and placing it after the "pot" and "template" parts because that tells me I can change those aspects of the entry.

While pondering a suggestion to fix this, I discovered that the info button is attached the expander, and it expands content that it is not pointing to. This is wrong. Every OS I have seen that uses an expander places it to the left of the content so that the arrows point to where your eyes look (like a checkbox). I toggled several times to learn what was being expanded. The expander should be to the left of the entry. I believe this is a separate bug that should not prevent you from landing this. If a bug is not reported, please do.

review: Needs Information (ui)

[Michael Nelson (michael.nelson)]

> Hi Henning.

Great work Henning! This will be an excellent precedent for other call-sites that need dynamically disabled options like this.

Sorry if it's confusing below, I started writing before you pushed your changes. I'm setting this to approve, but only with Curtis' feedback/approval also - there are two points below that I'm keen to hear his thoughts on.

>
> I really the addition of the picker, and your considerations of how to deal
> with unavailable status. I have a few concerns that this addition has
> exacerbated. The edit/info Translation Queue Entry links looks like they is
> separated from the content. With the addition of inline editing, the layout
> looks like a mistake.

I agree with Curtis here (and you - as you mentioned you foresaw this too).

>
> I think the icon to edit the translation queue entry must be closer to the
> parts it modifies. Consider creating the link twice and placing it after the
> "pot" and "template" parts because that tells me I can change those aspects of
> the entry.

That's a good solution that will mean the UI doesn't need to change at all when we eventually in-line those items too. I do think it's worth having the link in both places as suggested, rather than just after the template (as in your recent revs to fix this), although, you then mentioned that it is really only the translation domain that is edited. I'll leave that up to you - you know the usage of the page and can evaluate which option is better in the mean-time.

If you do decide to only have it in the one place, I wonder whether it would be best just to the right of "po/evolution-2.2-test.pot in Evolution trunk series" so it implies that it edits the whole item rather than just the template? (on the other hand, this could imply that it just edits the series). What do you think Curtis?

As an aside, is there a reason why we're not using columns with headers for the main info in this table? Like:

| Uploaded file | Package/Branch (?) | Uploaded by | Status |

or similar? (I'd still leave the template section where it is, especially if it's optional, as the form implies, otherwise the columns would be too wide and too much data).

>
> While pondering a suggestion to fix this, I discovered that the info button is
> attached the expander, and it expands content that it is not pointing to. This
> is wrong. Every OS I have seen that uses an expander places it to the left of
> the content so that the arrows point to where your eyes look (like a
> checkbox). I toggled several times to learn what was being expanded. The
> expander should be to the left of the entry. I believe this is a separate bug
> that should not prevent you from landing this. If a bug is not reported,
> please do.

+ 1. I actually had to check on edge to see what the info button did. When I clicked locally I saw:

{{{
new_button.attach is not a function
[Break on this error] new_button.attach('click', (shown ? hide_output : show_output));\n
}}}

(OK, you mentioned on IRC that you get this too).

If you do create a bug for the expander, I think it would be much more obvious if you had the following under the "Will be imported into..." (currently when expanded it is ab...

review: Approve (ui)

[Curtis Hovey (sinzui)]

Thanks for moving the edit icon into the content. I favour the icon by the pot and the template because that clearly indicates that they can be changed. As Michael noted, this change will prepare the users for when this information is editable inline. And as Michael noted, using a single edit icon implies I can only change a subset of the entry, not the whole entry that I am seeing. This suggestion is consistent with the idiom to use the edit icon after all inline content so that user can see that the value can be modified.

review: Approve (ui)

[Henning Eggers (henninge)]

== Tests ==

bin/test --layer=TranslationsWindmillLayer --test=ImportQueueStatusTest
bin/test -vvt translationimportqueue -t translation-import-queue

== Launchpad Lint ==

Sorry, make lint does not support bzr-pipline yet so I cannot easily produce this. :(

[Abel Deuring (adeuring)]

nice work!

review: Approve (code)

=== modified file 'lib/canonical/launchpad/icing/style-3-0.css'
--- lib/canonical/launchpad/icing/style-3-0.css	2009-11-19 05:18:56 +0000
+++ lib/canonical/launchpad/icing/style-3-0.css	2009-11-21 09:15:26 +0000
@@ -794,6 +794,21 @@
   background: inherit;
 }
 
+/* ==== Translations styles ==== */
+
+.translationimportstatusAPPROVED,
+.translationimportstatusAPPROVED a {color: #050;}
+.translationimportstatusIMPORTED,
+.translationimportstatusIMPORTED a {color: green;}
+.translationimportstatusDELETED,
+.translationimportstatusDELETED a {color: black;}
+.translationimportstatusFAILED,
+.translationimportstatusFAILED a {color: red;}
+.translationimportstatusNEEDS_REVIEW,
+.translationimportstatusNEEDS_REVIEW a {color: #f60;}
+.translationimportstatusBLOCKED,
+.translationimportstatusBLOCKED a {color: blue;}
+
 /* ==== Translations hand-made forms ==== */
 
 form.translations div.fields {

=== modified file 'lib/canonical/launchpad/javascript/translations/translations.js'
--- lib/canonical/launchpad/javascript/translations/translations.js	2009-11-04 19:59:16 +0000
+++ lib/canonical/launchpad/javascript/translations/translations.js	2009-11-21 09:15:26 +0000
@@ -2,7 +2,7 @@
  * GNU Affero General Public License version 3 (see the file LICENSE).
  *
  * @module TranslationImportQueue
- * @requires oop, event, node
+ * @requires oop, event, node, widget, plugin, overlay,lazr.choiceedit
  */
 
 YUI.add('translations', function(Y) {
@@ -51,7 +51,7 @@
         '</div>';
     new_button = button_field.create(text);
     button_field.replaceChild(new_button, button);
-    new_button.attach('click', (shown ? hide_output : show_output));
+    new_button.on('click', (shown ? hide_output : show_output));
     return button_field.get('parentNode');
 };
 
@@ -108,20 +108,77 @@
     lp.get(entry_uri, output_loader(div));
 };
 
+/**
+ * Create a choice widget for a given status picker. The function's signature
+ * is meant for it to be called from Node.each for each node that contains
+ * a settable status.
+ * The base configuration for the widget is taken from the choice_confs array
+ * which is defined in a code fragment that is included in the page via TAL.
+ */
+var init_status_choice = function(content_box, index, list) {
+    content_box.setStyle('display', '')
+    var conf = choice_confs[index];
+    conf.title = 'Change status to';
+    conf.contentBox = content_box;
+    var status_choice = new Y.ChoiceSource(conf);
+    status_choice.showError = function(err) {
+        display_error(null, err);
+    };
+    var entry_id = content_box.ancestor(function(node){
+        return node.hasClass('import_entry_row');
+    }).get('id');
+    status_choice.on('save', function(e) {
+        var value_box = content_box.query('.value');
+        var new_status = status_choice.get('value');
+        value_box.setContent(new_status);
+        config = {
+            on: {
+                success: function(entry) {
+                    Y.Array.each(conf.items, function(item) {
+                        if (item.value == new_status) {
+                            value_box.addClass(item.css_class);
+                        } else {
+                            value_box.removeClass(item.css_class);
+                        }
+                    });
+                }
+            },
+            parameters: {
+                new_status: new_status
+            }
+        };
+        Y.log(config);
+        lp_client = new LP.client.Launchpad();
+        var entry_uri = '+imports/' + entry_id;
+        lp_client.named_post(entry_uri, 'setStatus', config);
+    });
+    status_choice.render();
+};
 
 /**
- * Set up the import queue page.  Replace placeholders for error-output buttons
+ * Replace placeholders for error-output buttons
  * with actual buttons, and make them functional.
  */
+var init_error_output_buttons = function() {
+    var button_markers = Y.all('.show-output');
+    button_markers.set('innerHTML', compose_button(false));
+    button_markers.on('click', show_output);
+};
+
+/**
+ * Set up the import queue page.
+ */
 translations.initialize_import_queue_page = function (Y) {
     // Show spinner while patching up the page, pre-fetchig the image.
     var spinner_loader = Y.all('#spinner-loader');
     spinner_loader.set('innerHTML', '<img src="/@@/spinner" alt="" />');
-    var button_markers = Y.all('.show-output');
-    if (button_markers) {
-        button_markers.set('innerHTML', compose_button(false));
-        button_markers.attach('click', show_output);
-    }
+
+    // Set up error output buttons.
+    init_error_output_buttons();
+
+    // Set up status pickers.
+    Y.all('.status-choice').each(init_status_choice);
+
     // Remove the spinner again.
     spinner_loader.set('innerHTML', '');
 };
@@ -129,4 +186,5 @@
 }, '0.1', {
     // "oop" and "event" are required to fix known bugs in YUI, which
     // are apparently fixed in a later version.
-    requires: ['oop', 'event', 'node']});
+    requires: ['oop', 'event', 'node', 'widget', 'plugin', 'overlay',
+               'lazr.choiceedit', 'lp.client.plugins', 'lp.errors']});

=== modified file 'lib/canonical/launchpad/security.py'
--- lib/canonical/launchpad/security.py	2009-11-17 09:51:40 +0000
+++ lib/canonical/launchpad/security.py	2009-11-21 09:15:26 +0000
@@ -10,8 +10,8 @@
 from zope.component import getUtility
 
 from canonical.launchpad.interfaces.account import IAccount
+from lp.archiveuploader.permission import can_upload_to_archive
 from canonical.launchpad.interfaces.emailaddress import IEmailAddress
-from lp.archiveuploader.permission import verify_upload
 from lp.registry.interfaces.announcement import IAnnouncement
 from lp.soyuz.interfaces.archive import IArchive
 from lp.soyuz.interfaces.archivepermission import (
@@ -1578,17 +1578,6 @@
 
 def can_upload_linked_package(person, branch):
     """True if person may upload the package linked to `branch`."""
-
-    def get_current_release(ssp):
-        """Get current release for the source package linked to branch.
-
-        This function uses the `ISuiteSourcePackage` instance supplied.
-        """
-        package = ssp.sourcepackage
-        releases = ssp.distroseries.getCurrentSourceReleases(
-            [package.sourcepackagename])
-        return releases.get(package, None)
-
     # No associated `ISuiteSourcePackage` data -> not an official branch.
     # Abort.
     ssp_list = branch.associatedSuiteSourcePackages()
@@ -1601,31 +1590,10 @@
     # around this by assuming that things are fine as long as we find at least
     # one combination that allows us to upload the corresponding source
     # package.
-
-    # Go through the associated `ISuiteSourcePackage` instances and see
-    # whether we can upload to any of the distro series/pocket combinations.
-    ssp = None
     for ssp in ssp_list:
-        # Can we upload to the respective pocket?
-        if ssp.distroseries.canUploadToPocket(ssp.pocket):
-            break
-    else:
-        # Loop terminated normally i.e. we could not upload to any of the
-        # (distroseries, pocket) combinations found.
-        return False
-
-    archive = ssp.distroseries.distribution.main_archive
-    # Find the component the linked source package was published in.
-    current_release = get_current_release(ssp)
-    component = getattr(current_release, 'component', None)
-
-    # Is person authorised to upload the source package this branch
-    # is targeting?
-    result = verify_upload(
-        person, ssp.sourcepackagename, archive, component, ssp.distroseries)
-    # verify_upload() indicates that person *is* allowed to upload by
-    # returning None.
-    return result is None
+        if can_upload_to_archive(person, ssp):
+            return True
+    return False
 
 
 class AdminBranch(AuthorizationBase):

=== modified file 'lib/lp/archiveuploader/nascentupload.py'
--- lib/lp/archiveuploader/nascentupload.py	2009-11-16 21:53:47 +0000
+++ lib/lp/archiveuploader/nascentupload.py	2009-11-21 09:15:26 +0000
@@ -28,8 +28,8 @@
 from lp.archiveuploader.nascentuploadfile import (
     UploadError, UploadWarning, CustomUploadFile, SourceUploadFile,
     BaseBinaryUploadFile)
+from lp.archiveuploader.permission import check_upload_to_archive
 from lp.archiveuploader.utils import determine_source_file_type
-from lp.archiveuploader.permission import verify_upload
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.registry.interfaces.sourcepackage import SourcePackageFileType
 from lp.soyuz.interfaces.archive import ArchivePurpose, MAIN_ARCHIVE_PURPOSES
@@ -488,9 +488,10 @@
         source_name = getUtility(
             ISourcePackageNameSet).queryByName(self.changes.dsc.package)
 
-        rejection_reason = verify_upload(
-            signer, source_name, archive, self.changes.dsc.component,
-            self.policy.distroseries, not self.is_new)
+        rejection_reason = check_upload_to_archive(
+            signer, self.policy.distroseries, source_name, archive,
+            self.changes.dsc.component, self.policy.pocket, not self.is_new)
+
         if rejection_reason is not None:
             self.reject(str(rejection_reason))
 
@@ -996,6 +997,11 @@
             if self.is_ppa:
                 return
 
+            # XXX: JonathanLange 2009-09-16: It would be nice to use
+            # ISourcePackage.get_default_archive here, since it has the same
+            # logic. However, I'm not sure whether we can get a SourcePackage
+            # object.
+
             # See if there is an archive to override with.
             distribution = self.policy.distroseries.distribution
             archive = distribution.getArchiveByComponent(
@@ -1011,4 +1017,3 @@
             else:
                 # Reset the archive in the policy to the partner archive.
                 self.policy.archive = archive
-

=== modified file 'lib/lp/archiveuploader/permission.py'
--- lib/lp/archiveuploader/permission.py	2009-11-09 17:50:23 +0000
+++ lib/lp/archiveuploader/permission.py	2009-11-21 09:15:26 +0000
@@ -7,14 +7,17 @@
 __all__ = [
     'CannotUploadToArchive',
     'CannotUploadToPPA',
+    'can_upload_to_archive',
+    'check_upload_to_archive',
     'components_valid_for',
     'verify_upload',
     ]
 
 from zope.component import getUtility
 
-from lp.registry.interfaces.distribution import IDistributionSet
+from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.soyuz.interfaces.archivepermission import IArchivePermissionSet
+from lp.soyuz.interfaces.archive import ArchivePurpose
 
 
 class CannotUploadToArchive:
@@ -30,6 +33,15 @@
         return self._message
 
 
+class CannotUploadToPocket:
+    """Returned when a pocket is closed for uploads."""
+
+    def __init__(self, distroseries, pocket):
+        super(CannotUploadToPocket, self).__init__(
+            "Not permitted to upload to the %s pocket in a series in the "
+            "'%s' state." % (pocket.name, distroseries.status.name))
+
+
 class CannotUploadToPPA(CannotUploadToArchive):
     """Raised when a person cannot upload to a PPA."""
 
@@ -63,6 +75,18 @@
         super(NoRightsForComponent, self).__init__(component=component.name)
 
 
+class InvalidPocketForPPA(CannotUploadToArchive):
+    """PPAs only support some pockets."""
+
+    _fmt = "PPA uploads must be for the RELEASE pocket."
+
+
+class InvalidPocketForPartnerArchive(CannotUploadToArchive):
+    """Partner archives only support some pockets."""
+
+    _fmt = "Partner uploads must be for the RELEASE or PROPOSED pocket."
+
+
 def components_valid_for(archive, person):
     """Return the components that 'person' can upload to 'archive'.
 
@@ -75,6 +99,68 @@
     return set(permission.component for permission in permissions)
 
 
+def can_upload_to_archive(person, suitesourcepackage, archive=None):
+    """Check if 'person' upload 'suitesourcepackage' to 'archive'.
+
+    :param person: An `IPerson` who might be uploading.
+    :param suitesourcepackage: An `ISuiteSourcePackage` to be uploaded.
+    :param archive: The `IArchive` to upload to. If not provided, defaults
+        to the default archive for the source package. (See
+        `ISourcePackage.get_default_archive`).
+    :return: True if they can, False if they cannot.
+    """
+    sourcepackage = suitesourcepackage.sourcepackage
+    if archive is None:
+        archive = sourcepackage.get_default_archive()
+    pocket = suitesourcepackage.pocket
+    distroseries = sourcepackage.distroseries
+    sourcepackagename = sourcepackage.sourcepackagename
+    component = sourcepackage.latest_published_component
+    # strict_component is True because the source package already exists
+    # (otherwise we couldn't have a suitesourcepackage object) and
+    # nascentupload passes True as a matter of policy when the package exists.
+    reason = check_upload_to_archive(
+        person, distroseries, sourcepackagename, archive, component, pocket,
+        strict_component=True)
+    return reason is None
+
+
+def check_upload_to_archive(person, distroseries, sourcepackagename, archive,
+                            component, pocket, strict_component=True):
+    """Check if 'person' upload 'suitesourcepackage' to 'archive'.
+
+    :param person: An `IPerson` who might be uploading.
+    :param distroseries: The `IDistroSeries` being uploaded to.
+    :param sourcepackagename: The `ISourcePackageName` being uploaded.
+    :param archive: The `IArchive` to upload to. If not provided, defaults
+        to the default archive for the source package. (See
+        `ISourcePackage.get_default_archive`).
+    :param component: The `Component` being uploaded to.
+    :param pocket: The `PackagePublishingPocket` of 'distroseries' being
+        uploaded to.
+    :return: The reason for not being able to upload, None otherwise.
+    """
+    if archive.purpose == ArchivePurpose.PARTNER:
+        if pocket not in (
+            PackagePublishingPocket.RELEASE,
+            PackagePublishingPocket.PROPOSED):
+            return InvalidPocketForPartnerArchive()
+    elif archive.is_ppa:
+        if pocket != PackagePublishingPocket.RELEASE:
+            return InvalidPocketForPPA()
+    else:
+        # Uploads to the partner archive are allowed in any distroseries
+        # state.
+        # XXX julian 2005-05-29 bug=117557:
+        # This is a greasy hack until bug #117557 is fixed.
+        if not distroseries.canUploadToPocket(pocket):
+            return CannotUploadToPocket(distroseries, pocket)
+
+    return verify_upload(
+        person, sourcepackagename, archive, component, distroseries,
+        strict_component)
+
+
 def packagesets_valid_for(archive, person):
     """Return the package sets that 'person' can upload to 'archive'.
 

=== modified file 'lib/lp/archiveuploader/tests/test_permission.py'
--- lib/lp/archiveuploader/tests/test_permission.py	2009-11-10 09:58:28 +0000
+++ lib/lp/archiveuploader/tests/test_permission.py	2009-11-21 09:15:26 +0000
@@ -13,7 +13,9 @@
 from canonical.testing import DatabaseFunctionalLayer
 
 from lp.archiveuploader.permission import (
-    components_valid_for, verify_upload)
+    check_upload_to_archive, components_valid_for)
+from lp.registry.interfaces.distroseries import DistroSeriesStatus
+from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.soyuz.interfaces.archive import ArchivePurpose
 from lp.soyuz.interfaces.archivepermission import IArchivePermissionSet
 from lp.testing import TestCaseWithFactory
@@ -61,10 +63,14 @@
         # For now, just check that doesn't raise an exception.
         if distroseries is None:
             distroseries = archive.distribution.currentseries
+        if distroseries is None:
+            distroseries = self.factory.makeDistroSeries(
+                distribution=archive.distribution)
+        pocket = PackagePublishingPocket.RELEASE
         self.assertIs(
             None,
-            verify_upload(
-                person, spn, archive, component, distroseries,
+            check_upload_to_archive(
+                person, distroseries, spn, archive, component, pocket,
                 strict_component))
 
     def assertCannotUpload(self, reason, person, spn, archive, component,
@@ -82,8 +88,11 @@
         """
         if distroseries is None:
             distroseries = archive.distribution.currentseries
-        exception = verify_upload(
-            person, spn, archive, component, distroseries)
+        if distroseries is None:
+            distroseries = self.factory.makeDistroSeries()
+        pocket = PackagePublishingPocket.RELEASE
+        exception = check_upload_to_archive(
+            person, distroseries, spn, archive, component, pocket)
         self.assertEqual(reason, str(exception))
 
     def test_random_person_cannot_upload_to_ppa(self):
@@ -114,6 +123,18 @@
         removeSecurityProxy(team).addMember(person, team.teamowner)
         self.assertCanUpload(person, None, ppa, None)
 
+    def test_can_upload_to_ppa_for_old_series(self):
+        # You can upload whatever you want to a PPA, regardless of the upload
+        # policy.
+        person = self.factory.makePerson()
+        ppa = self.factory.makeArchive(
+            purpose=ArchivePurpose.PPA, owner=person)
+        spn = self.factory.makeSourcePackageName()
+        distroseries = self.factory.makeDistroSeries(
+            status=DistroSeriesStatus.CURRENT)
+        self.assertCanUpload(
+            person, spn, ppa, None, distroseries=distroseries)
+
     def test_arbitrary_person_cannot_upload_to_primary_archive(self):
         # By default, you can't upload to the primary archive.
         person = self.factory.makePerson()
@@ -144,10 +165,13 @@
         person = self.factory.makePerson()
         archive = self.factory.makeArchive(purpose=ArchivePurpose.PRIMARY)
         spn = self.factory.makeSourcePackageName()
-        package_set = self.factory.makePackageset(packages=[spn])
+        distroseries = self.factory.makeDistroSeries()
+        package_set = self.factory.makePackageset(
+            packages=[spn], distroseries=distroseries)
         self.permission_set.newPackagesetUploader(
             archive, person, package_set)
-        self.assertCanUpload(person, spn, archive, None)
+        self.assertCanUpload(
+            person, spn, archive, None, distroseries=distroseries)
 
     def test_packageset_wrong_distroseries(self):
         # A person with rights to upload to the package set in distro

=== modified file 'lib/lp/archiveuploader/uploadpolicy.py'
--- lib/lp/archiveuploader/uploadpolicy.py	2009-08-28 06:39:38 +0000
+++ lib/lp/archiveuploader/uploadpolicy.py	2009-11-21 09:15:26 +0000
@@ -130,29 +130,6 @@
                 # Buildd binary uploads (resulting from successful builds)
                 # to copy archives may go into *any* pocket.
                 return
-        if upload.is_ppa:
-            if self.pocket != PackagePublishingPocket.RELEASE:
-                upload.reject(
-                    "PPA uploads must be for the RELEASE pocket.")
-        elif (self.archive.purpose == ArchivePurpose.PARTNER and
-              self.pocket != PackagePublishingPocket.RELEASE and
-              self.pocket != PackagePublishingPocket.PROPOSED):
-            # Partner uploads can only go to the release or proposed
-            # pockets.
-            upload.reject(
-                "Partner uploads must be for the RELEASE or PROPOSED pocket.")
-        else:
-            # Uploads to the partner archive are allowed in any distroseries
-            # state.
-            # XXX julian 2005-05-29 bug=117557:
-            # This is a greasy hack until bug #117557 is fixed.
-            if (self.distroseries and
-                self.archive.purpose != ArchivePurpose.PARTNER and
-                not self.distroseries.canUploadToPocket(self.pocket)):
-                upload.reject(
-                    "Not permitted to upload to the %s pocket in a "
-                    "series in the '%s' state." % (
-                    self.pocket.name, self.distroseries.status.name))
 
         # reject PPA uploads by default
         self.rejectPPAUploads(upload)

=== modified file 'lib/lp/registry/browser/person.py'
--- lib/lp/registry/browser/person.py	2009-11-17 13:37:49 +0000
+++ lib/lp/registry/browser/person.py	2009-11-21 09:15:26 +0000
@@ -2857,13 +2857,15 @@
         else:
             raise AssertionError('Unknown group to contact.')
 
+    @property
     def should_show_polls_portlet(self):
         menu = TeamOverviewMenu(self.context)
         return (
-            self.hasCurrentPolls() or self.closedpolls
+            self.has_current_polls or self.closedpolls
             or menu.add_poll().enabled)
 
-    def hasCurrentPolls(self):
+    @property
+    def has_current_polls(self):
         """Return True if this team has any non-closed polls."""
         assert self.context.isTeam()
         return bool(self.openpolls) or bool(self.notyetopenedpolls)

=== added file 'lib/lp/registry/browser/tests/poll-views.txt'
--- lib/lp/registry/browser/tests/poll-views.txt	1970-01-01 00:00:00 +0000
+++ lib/lp/registry/browser/tests/poll-views.txt	2009-11-21 09:15:26 +0000
@@ -0,0 +1,134 @@
+Poll views
+----------
+
+The polls portlet shows the state of current polls, and links to past
+polls.
+
+    >>> from canonical.launchpad.testing.pages import extract_text
+
+    >>> user = factory.makePerson()
+    >>> team = factory.makeTeam(name='team')
+    >>> owner = team.teamowner
+
+    >>> def create_team_view(team, name=None, principal=None):
+    ...     # XRDS inheritance requires a lot of setup.
+    ...     path_info = '/~%s' % team.name
+    ...     server_url = 'http://launchpad.dev'
+    ...     view = create_view(
+    ...         team, name=name, principal=principal,
+    ...         server_url=server_url, PATH_INFO=path_info)
+    ...     view.initialize()
+    ...     return view
+
+The portlet does not render any markup when there are no polls...
+
+    >>> login_person(user)
+    >>> view = create_team_view(team, name='+portlet-polls', principal=user)
+    >>> view.has_current_polls
+    False
+
+    >>> view.should_show_polls_portlet
+    False
+
+    >>> print extract_text(view.render())
+    <BLANKLINE>
+
+Unless the user is a team owner.
+
+    >>> login_person(owner)
+    >>> view = create_team_view(team, name='+portlet-polls', principal=owner)
+    >>> view.has_current_polls
+    False
+
+    >>> view.should_show_polls_portlet
+    True
+
+    >>> print extract_text(view.render())
+    Polls
+    No current polls.
+    Show polls
+    Create a poll
+
+The portlet shows a link to polls to all users when there is a poll, but it
+has not opened.
+
+    >>> import pytz
+    >>> from datetime import datetime, timedelta
+    >>> from lp.registry.interfaces.poll import IPollSubset, PollSecrecy
+
+    >>> open_date = datetime.now().replace(tzinfo=pytz.timezone('UTC'))
+    >>> close_date = open_date + timedelta(weeks=1)
+    >>> poll_subset = IPollSubset(team)
+    >>> poll = poll_subset.new(
+    ...     'name', 'title', 'proposition', open_date, close_date,
+    ...     PollSecrecy.OPEN, False)
+
+    >>> login_person(user)
+    >>> view = create_team_view(team, name='+portlet-polls', principal=user)
+    >>> view.has_current_polls
+    True
+
+    >>> view.should_show_polls_portlet
+    True
+
+    >>> print extract_text(view.render())
+    Polls
+    Show polls
+
+The portlet shows more details to the poll owner.
+
+    >>> login_person(owner)
+    >>> view = create_team_view(team, name='+portlet-polls', principal=owner)
+    >>> view.has_current_polls
+    True
+
+    >>> view.should_show_polls_portlet
+    True
+
+    >>> print extract_text(view.render())
+    Polls
+    title - opens in 5 hours
+    Show polls
+    Create a poll
+
+Current polls are listed in the portlet, the only difference between a user
+and an owner is the owner has a link to create more polls.
+
+    >>> poll.dateopens = open_date - timedelta(weeks=2)
+
+    >>> login_person(user)
+    >>> view = create_team_view(team, name='+portlet-polls', principal=user)
+    >>> print extract_text(view.render())
+    Polls
+    title - closes on ...
+    You have seven days left to vote in this poll.
+    Show polls
+
+    >>> login_person(owner)
+    >>> view = create_team_view(team, name='+portlet-polls', principal=owner)
+    >>> print extract_text(view.render())
+    Polls
+    title - closes on ...
+    You have seven days left to vote in this poll.
+    Show polls
+    Create a poll
+
+When all the polls are closed, the portlet states the case and has a link to
+see the polls.
+
+    >>> poll.datecloses = close_date - timedelta(weeks=2)
+
+    >>> login_person(user)
+    >>> view = create_team_view(team, name='+portlet-polls', principal=user)
+    >>> print extract_text(view.render())
+    Polls
+    No current polls.
+    Show polls
+
+    >>> login_person(owner)
+    >>> view = create_team_view(team, name='+portlet-polls', principal=owner)
+    >>> print extract_text(view.render())
+    Polls
+    No current polls.
+    Show polls
+    Create a poll

=== modified file 'lib/lp/registry/configure.zcml'
--- lib/lp/registry/configure.zcml	2009-11-19 15:23:25 +0000
+++ lib/lp/registry/configure.zcml	2009-11-21 09:15:26 +0000
@@ -1603,12 +1603,10 @@
             permission="launchpad.Edit"
             set_attributes="name displayname description http_base_url
                             ftp_base_url rsync_base_url enabled speed
-                            country content official_candidate" />
-        <require
-            permission="launchpad.Admin"
-            set_attributes="status owner whiteboard reviewer date_reviewed" />
-        <require
-            permission="launchpad.Admin"
+                            country content official_candidate owner" />
+        <require
+            permission="launchpad.Admin"
+            set_attributes="status whiteboard reviewer date_reviewed"
             attributes="destroySelf" />
     </class>
 

=== modified file 'lib/lp/registry/doc/distribution-mirror.txt'
--- lib/lp/registry/doc/distribution-mirror.txt	2009-10-26 18:40:04 +0000
+++ lib/lp/registry/doc/distribution-mirror.txt	2009-11-21 09:15:26 +0000
@@ -761,7 +761,26 @@
   >>> print view._sum_throughput(mirrors)
   37 Gbps
 
-== Deleting mirrors ==
+
+Changing mirror owners
+----------------------
+
+The mirror owner can change the owner to another user.
+
+    >>> owner = factory.makePerson(name='raccoon')
+    >>> new_owner = factory.makePerson(name='bear')
+    >>> mirror = ubuntu.newMirror(
+    ...     owner, speed, brazil, content, http_base_url='http://a.ab/')
+
+
+    >>> login_person(mirror.owner)
+    >>> mirror.owner = new_owner
+    >>> print mirror.owner.name
+    bear
+
+
+Deleting mirrors
+----------------
 
 Mirrors are sometimes created by spammers hoping that we'll publicize
 whatever links they put there. Although we only publicize mirrors that
@@ -771,7 +790,7 @@
 
 Only mirrors which have never been probed can be deleted this way.
 
-    >>> login(cdimage_mirror.owner.preferredemail.email)
+    >>> login_person(cdimage_mirror.owner)
     >>> cdimage_mirror.destroySelf()
     Traceback (most recent call last):
     ...

=== modified file 'lib/lp/registry/interfaces/distribution.py'
--- lib/lp/registry/interfaces/distribution.py	2009-11-13 16:24:01 +0000
+++ lib/lp/registry/interfaces/distribution.py	2009-11-21 09:15:26 +0000
@@ -16,6 +16,7 @@
     'IDistributionMirrorMenuMarker',
     'IDistributionPublic',
     'IDistributionSet',
+    'NoPartnerArchive',
     'NoSuchDistribution',
     ]
 
@@ -580,5 +581,14 @@
     _message_prefix = "No such distribution"
 
 
+class NoPartnerArchive(Exception):
+    """Raised when a partner archive is needed, but none exists."""
+
+    def __init__(self, distribution):
+        Exception.__init__(
+            self, "Partner archive for distro '%s' not found"
+            % (distribution.name,))
+
+
 # Monkey patching to fix circular imports done in
 # _schema_circular_imports.py

=== modified file 'lib/lp/registry/interfaces/sourcepackage.py'
--- lib/lp/registry/interfaces/sourcepackage.py	2009-11-20 14:02:54 +0000
+++ lib/lp/registry/interfaces/sourcepackage.py	2009-11-21 09:15:26 +0000
@@ -224,6 +224,20 @@
         title=u'The component in which the package was last published.',
         schema=IComponent, readonly=True, required=False)
 
+    def get_default_archive(component=None):
+        """Get the default archive of this package.
+
+        If 'component' is a partner component, then the default archive is the
+        partner archive. Otherwise, the primary archive of the associated
+        distribution.
+
+        :param component: The `IComponent` to base the default archive
+            decision on. If None, defaults to the last published component.
+        :raise NoPartnerArchive: If returning the partner archive is
+            appropriate, but no partner archive exists.
+        :return: `IArchive`.
+        """
+
     def getLatestTranslationsUploads():
         """Find latest Translations tarballs as produced by Soyuz.
 

=== modified file 'lib/lp/registry/model/sourcepackage.py'
--- lib/lp/registry/model/sourcepackage.py	2009-11-20 09:26:43 +0000
+++ lib/lp/registry/model/sourcepackage.py	2009-11-21 09:15:26 +0000
@@ -23,10 +23,11 @@
 from canonical.database.sqlbase import flush_database_updates, sqlvalues
 from canonical.lazr.utils import smartquote
 from lp.code.model.branch import Branch
+from lp.code.model.hasbranches import HasBranchesMixin, HasMergeProposalsMixin
 from lp.bugs.model.bug import get_bug_tags_open_count
 from lp.bugs.model.bugtarget import BugTargetBase
 from lp.bugs.model.bugtask import BugTask
-from lp.code.model.hasbranches import HasBranchesMixin, HasMergeProposalsMixin
+from lp.soyuz.interfaces.archive import IArchiveSet, ArchivePurpose
 from lp.soyuz.model.build import Build, BuildSet
 from lp.soyuz.model.distributionsourcepackagerelease import (
     DistributionSourcePackageRelease)
@@ -52,6 +53,7 @@
 from lp.soyuz.interfaces.buildrecords import IHasBuildRecords
 from lp.registry.interfaces.packaging import PackagingType
 from lp.translations.interfaces.potemplate import IHasTranslationTemplates
+from lp.registry.interfaces.distribution import NoPartnerArchive
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.soyuz.interfaces.publishing import PackagePublishingStatus
 from lp.soyuz.interfaces.queue import PackageUploadCustomFormat
@@ -581,6 +583,21 @@
         else:
             return None
 
+    def get_default_archive(self, component=None):
+        """See `ISourcePackage`."""
+        if component is None:
+            component = self.latest_published_component
+        distribution = self.distribution
+        if component is not None and component.name == 'partner':
+            archive = getUtility(IArchiveSet).getByDistroPurpose(
+                distribution, ArchivePurpose.PARTNER)
+            if archive is None:
+                raise NoPartnerArchive(distribution)
+            else:
+                return archive
+        else:
+            return distribution.main_archive
+
     def getTranslationTemplates(self):
         """See `IHasTranslationTemplates`."""
         result = POTemplate.selectBy(

=== modified file 'lib/lp/registry/templates/people-requestmerge.pt'
--- lib/lp/registry/templates/people-requestmerge.pt	2009-11-15 20:42:16 +0000
+++ lib/lp/registry/templates/people-requestmerge.pt	2009-11-21 09:15:26 +0000
@@ -29,10 +29,9 @@
         <p class="discreet">
           Note: If you no longer have access to the duplicated account's
           email address, you may place a
-          <a href="/launchpad/+addquestion">support request</a> or contact us
-          at <a href="mailto:[e-mail]"
-             >[e-mail]</a>. The Launchpad administrators will
-          tend to your request as soon as possible.
+          <a href="/launchpad/+addquestion">support request</a>.
+          The Launchpad administrators will tend to your request as soon
+          as possible.
         </p>
         </tal:extra_info>
 

=== modified file 'lib/lp/registry/templates/team-polls.pt'
--- lib/lp/registry/templates/team-polls.pt	2009-08-21 18:18:04 +0000
+++ lib/lp/registry/templates/team-polls.pt	2009-11-21 09:15:26 +0000
@@ -16,11 +16,11 @@
 
     <h2>Current polls</h2>
 
-    <p tal:condition="not: view/hasCurrentPolls">
+    <p tal:condition="not: view/has_current_polls">
       This team has no open polls nor polls that are not yet opened.
     </p>
 
-    <ul tal:condition="view/hasCurrentPolls">
+    <ul tal:condition="view/has_current_polls">
       <li tal:repeat="poll view/openpolls">
         <a tal:attributes="href poll/fmt:url">
           <span tal:replace="poll/title" />

=== modified file 'lib/lp/registry/templates/team-portlet-polls.pt'
--- lib/lp/registry/templates/team-portlet-polls.pt	2009-09-09 18:50:13 +0000
+++ lib/lp/registry/templates/team-portlet-polls.pt	2009-11-21 09:15:26 +0000
@@ -8,11 +8,11 @@
        tal:define="overview_menu context/menu:overview"
        tal:condition="view/should_show_polls_portlet">
     <h2>Polls</h2>
-    <p tal:condition="not: view/hasCurrentPolls">
-      No polls created.
+    <p tal:condition="not: view/has_current_polls">
+      No current polls.
     </p>
 
-    <ul tal:condition="view/hasCurrentPolls">
+    <ul tal:condition="view/has_current_polls">
       <li tal:repeat="poll view/openpolls">
         <a tal:attributes="href poll/fmt:url">
           <span tal:replace="poll/title" />
@@ -48,7 +48,7 @@
       </li>
     </ul>
 
-    <a tal:condition="view/hasCurrentPolls"
+    <a tal:condition="view/should_show_polls_portlet"
        tal:replace="structure overview_menu/polls/fmt:link" />
     <a tal:replace="structure overview_menu/add_poll/fmt:link" />
 

=== modified file 'lib/lp/registry/tests/test_sourcepackage.py'
--- lib/lp/registry/tests/test_sourcepackage.py	2009-08-28 06:39:38 +0000
+++ lib/lp/registry/tests/test_sourcepackage.py	2009-11-21 09:15:26 +0000
@@ -12,9 +12,13 @@
 from zope.security.proxy import removeSecurityProxy
 
 from canonical.launchpad.ftests import login_person, logout
+from lp.registry.interfaces.distribution import NoPartnerArchive
 from lp.registry.interfaces.distroseries import DistroSeriesStatus
 from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
 from lp.registry.interfaces.pocket import PackagePublishingPocket
+from lp.soyuz.interfaces.archive import ArchivePurpose
+from lp.soyuz.interfaces.component import IComponentSet
+from lp.soyuz.interfaces.publishing import PackagePublishingStatus
 from lp.code.interfaces.seriessourcepackagebranch import (
     IMakeOfficialBranchLinks)
 from lp.testing import TestCaseWithFactory
@@ -166,6 +170,59 @@
             distribution_sourcepackage,
             sourcepackage.distribution_sourcepackage)
 
+    def test_default_archive(self):
+        # The default archive of a source package is the primary archive of
+        # its distribution.
+        sourcepackage = self.factory.makeSourcePackage()
+        distribution = sourcepackage.distribution
+        self.assertEqual(
+            distribution.main_archive, sourcepackage.get_default_archive())
+
+    def test_default_archive_partner(self):
+        # If the source package was most recently uploaded to a partner
+        # component, then its default archive is the partner archive for the
+        # distribution.
+        sourcepackage = self.factory.makeSourcePackage()
+        partner = getUtility(IComponentSet)['partner']
+        self.factory.makeSourcePackagePublishingHistory(
+            sourcepackagename=sourcepackage.sourcepackagename,
+            distroseries=sourcepackage.distroseries,
+            component=partner,
+            status=PackagePublishingStatus.PUBLISHED)
+        distribution = sourcepackage.distribution
+        expected_archive = self.factory.makeArchive(
+            distribution=distribution,
+            purpose=ArchivePurpose.PARTNER)
+        self.assertEqual(
+            expected_archive, sourcepackage.get_default_archive())
+
+    def test_default_archive_specified_component(self):
+        # If the component is explicitly specified as partner, then we return
+        # the partner archive.
+        sourcepackage = self.factory.makeSourcePackage()
+        partner = getUtility(IComponentSet)['partner']
+        distribution = sourcepackage.distribution
+        expected_archive = self.factory.makeArchive(
+            distribution=distribution,
+            purpose=ArchivePurpose.PARTNER)
+        self.assertEqual(
+            expected_archive,
+            sourcepackage.get_default_archive(component=partner))
+
+    def test_default_archive_partner_doesnt_exist(self):
+        # If the default archive ought to be the partner archive (because the
+        # last published upload was to a partner component) then
+        # default_archive will raise an exception.
+        sourcepackage = self.factory.makeSourcePackage()
+        partner = getUtility(IComponentSet)['partner']
+        self.factory.makeSourcePackagePublishingHistory(
+            sourcepackagename=sourcepackage.sourcepackagename,
+            distroseries=sourcepackage.distroseries,
+            component=partner,
+            status=PackagePublishingStatus.PUBLISHED)
+        self.assertRaises(
+            NoPartnerArchive, sourcepackage.get_default_archive)
+
 
 class TestSourcePackageSecurity(TestCaseWithFactory):
     """Tests for source package branch linking security."""

=== modified file 'lib/lp/soyuz/interfaces/component.py'
--- lib/lp/soyuz/interfaces/component.py	2009-06-25 04:06:00 +0000
+++ lib/lp/soyuz/interfaces/component.py	2009-11-21 09:15:26 +0000
@@ -10,7 +10,7 @@
 __all__ = [
     'IComponent',
     'IComponentSelection',
-    'IComponentSet'
+    'IComponentSet',
     ]
 
 from zope.interface import Interface, Attribute
@@ -18,6 +18,7 @@
 
 from canonical.launchpad import _
 
+
 class IComponent(Interface):
     """Represents the Component table.
 
@@ -54,4 +55,3 @@
 
     def new(name):
         """Create a new component."""
-

=== modified file 'lib/lp/testing/factory.py'
--- lib/lp/testing/factory.py	2009-11-19 15:23:25 +0000
+++ lib/lp/testing/factory.py	2009-11-21 09:15:26 +0000
@@ -34,17 +34,25 @@
 
 from canonical.autodecorate import AutoDecorate
 from canonical.config import config
+from canonical.database.constants import UTC_NOW
 from lp.codehosting.codeimport.worker import CodeImportSourceDetails
 from canonical.database.sqlbase import flush_database_updates
 from lp.soyuz.adapters.packagelocation import PackageLocation
+from lp.soyuz.interfaces.publishing import PackagePublishingStatus
+from lp.soyuz.interfaces.section import ISectionSet
 from canonical.launchpad.database.account import Account
 from canonical.launchpad.database.emailaddress import EmailAddress
 from canonical.launchpad.database.message import Message, MessageChunk
 from lp.soyuz.model.processor import ProcessorFamilySet
+from lp.soyuz.model.publishing import (
+    SecureSourcePackagePublishingHistory,
+    SourcePackagePublishingHistory,
+    )
 from canonical.launchpad.interfaces import IMasterStore
 from canonical.launchpad.interfaces.account import (
     AccountCreationRationale, AccountStatus, IAccountSet)
-from lp.soyuz.interfaces.archive import IArchiveSet, ArchivePurpose
+from lp.soyuz.interfaces.archive import (
+    default_name_by_purpose, IArchiveSet, ArchivePurpose)
 from lp.blueprints.interfaces.sprint import ISprintSet
 from lp.bugs.interfaces.bug import CreateBugParams, IBugSet
 from lp.bugs.interfaces.bugtask import BugTaskStatus
@@ -104,7 +112,8 @@
 from lp.registry.interfaces.product import IProductSet, License
 from lp.registry.interfaces.productseries import IProductSeries
 from lp.registry.interfaces.project import IProjectSet
-from lp.registry.interfaces.sourcepackage import ISourcePackage
+from lp.registry.interfaces.sourcepackage import (
+    ISourcePackage, SourcePackageUrgency)
 from lp.registry.interfaces.sourcepackagename import (
     ISourcePackageNameSet)
 from lp.registry.interfaces.ssh import ISSHKeySet, SSHKeyType
@@ -126,6 +135,7 @@
     password that needs to happen on the master store and this is forced.
     However, if we then read it back the default Store has to be used.
     """
+
     def with_default_master_store(*args, **kw):
         try:
             store_selector = getUtility(IStoreSelector)
@@ -140,9 +150,9 @@
     return mergeFunctionMetadata(func, with_default_master_store)
 
 
-# We use this for default paramters where None has a specific meaning.  For
-# example, makeBranch(product=None) means "make a junk branch".
-# None, because None means "junk branch".
+# We use this for default parameters where None has a specific meaning. For
+# example, makeBranch(product=None) means "make a junk branch". None, because
+# None means "junk branch".
 _DEFAULT = object()
 
 
@@ -179,10 +189,9 @@
         :return: A hexadecimal string, with 'a'-'f' in lower case.
         """
         hex_number = '%x' % self.getUniqueInteger()
-        if digits is None:
-            return hex_number
-        else:
-            return hex_number.zfill(digits)
+        if digits is not None:
+            hex_number = hex_number.zfill(digits)
+        return hex_number
 
     def getUniqueString(self, prefix=None):
         """Return a string unique to this factory instance.
@@ -266,9 +275,10 @@
 
     def makeGPGKey(self, owner):
         """Give 'owner' a crappy GPG key for the purposes of testing."""
+        key_id = self.getUniqueHexString(digits=8).upper()
         return getUtility(IGPGKeySet).new(
             owner.id,
-            keyid=self.getUniqueHexString(digits=8).upper(),
+            keyid=key_id,
             fingerprint='A' * 40,
             keysize=self.getUniqueInteger(),
             algorithm=GPGKeyAlgorithm.R,
@@ -1470,7 +1480,7 @@
         return getUtility(IComponentSet).ensure(name)
 
     def makeArchive(self, distribution=None, owner=None, name=None,
-                    purpose = None):
+                    purpose=None):
         """Create and return a new arbitrary archive.
 
         :param distribution: Supply IDistribution, defaults to a new one
@@ -1484,10 +1494,13 @@
             distribution = self.makeDistribution()
         if owner is None:
             owner = self.makePerson()
-        if name is None:
-            name = self.getUniqueString()
         if purpose is None:
             purpose = ArchivePurpose.PPA
+        if name is None:
+            try:
+                name = default_name_by_purpose[purpose]
+            except KeyError:
+                name = self.getUniqueString()
 
         # Making a distribution makes an archive, and there can be only one
         # per distribution.
@@ -1750,6 +1763,111 @@
             distroseries = self.makeDistroRelease()
         return distroseries.getSourcePackage(sourcepackagename)
 
+    def getAnySourcePackageUrgency(self):
+        return SourcePackageUrgency.MEDIUM
+
+    def makeSourcePackagePublishingHistory(self, sourcepackagename=None,
+                                           distroseries=None, maintainer=None,
+                                           creator=None, component=None,
+                                           section=None, urgency=None,
+                                           version=None, archive=None,
+                                           builddepends=None,
+                                           builddependsindep=None,
+                                           build_conflicts=None,
+                                           build_conflicts_indep=None,
+                                           architecturehintlist='all',
+                                           dateremoved=None,
+                                           date_uploaded=UTC_NOW,
+                                           pocket=None,
+                                           status=None,
+                                           scheduleddeletiondate=None,
+                                           dsc_standards_version='3.6.2',
+                                           dsc_format='1.0',
+                                           dsc_binaries='foo-bin',
+                                           ):
+        if sourcepackagename is None:
+            sourcepackagename = self.makeSourcePackageName()
+        spn = sourcepackagename
+
+        if distroseries is None:
+            distroseries = self.makeDistroRelease()
+
+        if archive is None:
+            archive = self.makeArchive(
+                distribution=distroseries.distribution,
+                purpose=ArchivePurpose.PRIMARY)
+
+        if component is None:
+            component = self.makeComponent()
+
+        if pocket is None:
+            pocket = self.getAnyPocket()
+
+        if status is None:
+            status = PackagePublishingStatus.PENDING
+
+        if urgency is None:
+            urgency = self.getAnySourcePackageUrgency()
+
+        if section is None:
+            section = self.getUniqueString('section')
+        section = getUtility(ISectionSet).ensure(section)
+
+        if maintainer is None:
+            maintainer = self.makePerson()
+
+        maintainer_email = '%s <%s>' % (
+            maintainer.displayname,
+            maintainer.preferredemail.email)
+
+        if creator is None:
+            creator = self.makePerson()
+
+        if version is None:
+            version = self.getUniqueString('version')
+
+        gpg_key = self.makeGPGKey(creator)
+
+        spr = distroseries.createUploadedSourcePackageRelease(
+            sourcepackagename=spn,
+            maintainer=maintainer,
+            creator=creator,
+            component=component,
+            section=section,
+            urgency=urgency,
+            version=version,
+            builddepends=builddepends,
+            builddependsindep=builddependsindep,
+            build_conflicts=build_conflicts,
+            build_conflicts_indep=build_conflicts_indep,
+            architecturehintlist=architecturehintlist,
+            changelog_entry=None,
+            dsc=None,
+            copyright=self.getUniqueString(),
+            dscsigningkey=gpg_key,
+            dsc_maintainer_rfc822=maintainer_email,
+            dsc_standards_version=dsc_standards_version,
+            dsc_format=dsc_format,
+            dsc_binaries=dsc_binaries,
+            archive=archive, dateuploaded=date_uploaded)
+
+        sspph = SecureSourcePackagePublishingHistory(
+            distroseries=distroseries,
+            sourcepackagerelease=spr,
+            component=spr.component,
+            section=spr.section,
+            status=status,
+            datecreated=date_uploaded,
+            dateremoved=dateremoved,
+            scheduleddeletiondate=scheduleddeletiondate,
+            pocket=pocket,
+            embargo=False,
+            archive=archive)
+
+        # SPPH and SSPPH IDs are the same, since they are SPPH is a SQLVIEW
+        # of SSPPH and other useful attributes.
+        return SourcePackagePublishingHistory.get(sspph.id)
+
     def makePackageset(self, name=None, description=None, owner=None,
                        packages=(), distroseries=None):
         """Make an `IPackageset`."""

=== modified file 'lib/lp/translations/browser/hastranslationimports.py'
--- lib/lp/translations/browser/hastranslationimports.py	2009-11-17 09:50:33 +0000
+++ lib/lp/translations/browser/hastranslationimports.py	2009-11-21 09:15:26 +0000
@@ -11,6 +11,7 @@
 
 import datetime
 import pytz
+import simplejson
 from zope.app.form.browser import DropdownWidget
 from zope.component import getUtility
 from zope.formlib import form
@@ -33,6 +34,7 @@
     LaunchpadFormView, action, custom_widget, safe_action)
 from canonical.launchpad.webapp.authorization import check_permission
 from canonical.launchpad.webapp.batching import TableBatchNavigator
+from canonical.widgets.lazrjs import vocabulary_to_choice_edit_items
 
 
 class HasTranslationImportsView(LaunchpadFormView):
@@ -115,7 +117,7 @@
         return form.Fields(
             Choice(
                 __name__=name,
-                source=EntryImportStatusVocabularyFactory(entry),
+                source=EntryImportStatusVocabularyFactory(entry, self.user),
                 title=_('Select import status')),
             custom_widget=self.custom_widgets['status'],
             render_context=self.render_context)
@@ -219,28 +221,21 @@
             # The status changed.
             number_of_changes += 1
 
-            # Only the importer, launchpad admins or Rosetta experts have
-            # special permissions to change status.
-            if (new_status_name == RosettaImportStatus.DELETED.name and
-                check_permission('launchpad.Edit', entry)):
-                entry.setStatus(RosettaImportStatus.DELETED, self.user)
-            elif (new_status_name == RosettaImportStatus.BLOCKED.name and
-                  check_permission('launchpad.Admin', entry)):
-                entry.setStatus(RosettaImportStatus.BLOCKED, self.user)
-            elif (new_status_name == RosettaImportStatus.APPROVED.name and
-                  check_permission('launchpad.Admin', entry) and
-                  entry.import_into is not None):
-                entry.setStatus(RosettaImportStatus.APPROVED, self.user)
-            elif (new_status_name == RosettaImportStatus.NEEDS_REVIEW.name and
-                  check_permission('launchpad.Admin', entry)):
-                entry.setStatus(RosettaImportStatus.NEEDS_REVIEW, self.user)
-            else:
-                # The user was not the importer or we are trying to set a
-                # status that must not be set from this form. That means that
-                # it's a broken request.
+            # Determine status enum from from value.
+            new_status = None
+            for status in RosettaImportStatus.items:
+                if new_status_name == status.name:
+                    new_status = status
+                    break
+            if new_status is None:
+                # We are trying to set a bogus status. 
+                # That means that it's a broken request.
                 raise UnexpectedFormData(
                     'Ignored the request to change the status from %s to %s.'
                         % (entry.status.name, new_status_name))
+            else:
+                # This will raise an exception if the user is not authorized.
+                entry.setStatus(new_status, self.user)
 
             # Update the date_status_change field.
             UTC = pytz.timezone('UTC')
@@ -330,44 +325,50 @@
         """Return batch object for this page."""
         return TableBatchNavigator(self.entries, self.request)
 
+    @property
+    def choice_confs_js(self):
+        """"Generate configuration for lazr-js widget.
+
+        Only editable items are included in the list.
+        """
+        confs = []
+        for entry in self.batchnav.batch:
+            if check_permission('launchpad.Edit', entry):
+                confs.append(self.generateChoiceConfForEntry(entry))
+        return 'var choice_confs = %s;' % simplejson.dumps(confs)
+
+    def generateChoiceConfForEntry(self, entry):
+        disabled_items = [
+            item.value for item in RosettaImportStatus
+                       if not entry.canSetStatus(item.value, self.user)]
+        items = vocabulary_to_choice_edit_items(
+                RosettaImportStatus, disabled_items=disabled_items,
+                css_class_prefix='translationimportstatus')
+        return {
+            'value': entry.status.title,
+            'items': items}
 
 class EntryImportStatusVocabularyFactory:
     """Factory for a vocabulary containing a list of statuses for import."""
 
     implements(IContextSourceBinder)
 
-    def __init__(self, entry):
+    def __init__(self, entry, user):
         """Create a EntryImportStatusVocabularyFactory.
 
         :param entry: The ITranslationImportQueueEntry related with this
             vocabulary.
         """
         self.entry = entry
+        self.user = user
 
     def __call__(self, context):
         terms = []
         for status in RosettaImportStatus.items:
-            if (status in (RosettaImportStatus.FAILED,
-                           RosettaImportStatus.IMPORTED) and
-                self.entry.status != status):
-                # FAILED and IMPORTED status cannot be set by hand so we
-                # don't give that choice.
-                continue
-            if (status == RosettaImportStatus.APPROVED and
-                self.entry.status != status and
-                (self.entry.import_into is None or
-                 not check_permission('launchpad.Admin', self.entry))):
-                # Only administrators are able to set the APPROVED status, and
-                # that's only possible if we know where to import it
-                # (import_into not None).
-                continue
-            if (status == RosettaImportStatus.BLOCKED and
-                self.entry.status != status and
-                not check_permission('launchpad.Admin', self.entry)):
-                # Only administrators are able to set the BLOCKED status
-                continue
-
-            terms.append(SimpleTerm(status.name, status.name, status.title))
+            if (status == self.entry.status or 
+                self.entry.canSetStatus(status, self.user)):
+                terms.append(
+                    SimpleTerm(status.name, status.name, status.title))
         return SimpleVocabulary(terms)
 
 

=== modified file 'lib/lp/translations/model/translationimportqueue.py'
--- lib/lp/translations/model/translationimportqueue.py	2009-11-19 07:45:09 +0000
+++ lib/lp/translations/model/translationimportqueue.py	2009-11-21 09:15:26 +0000
@@ -296,9 +296,6 @@
 
     def canSetStatus(self, new_status, user):
         """See `ITranslationImportQueueEntry`."""
-        if new_status == self.status:
-            # Leaving status as it is is always allowed.
-            return True
         if user is None:
             # Anonymous user cannot do anything.
             return False

=== modified file 'lib/lp/translations/stories/importqueue/xx-translation-import-queue.txt'
--- lib/lp/translations/stories/importqueue/xx-translation-import-queue.txt	2009-09-07 12:16:29 +0000
+++ lib/lp/translations/stories/importqueue/xx-translation-import-queue.txt	2009-11-21 09:15:26 +0000
@@ -50,12 +50,11 @@
     ...     'http://translations.launchpad.dev/firefox/1.0/+imports')
     >>> print anon_browser.url
     http://translations.launchpad.dev/firefox/1.0/+imports
-    >>> 'po/es.po' in anon_browser.contents
-    True
-    >>> 'Mozilla Firefox 1.0 series' in anon_browser.contents
-    True
-    >>> '<td>Needs Review</td>' in anon_browser.contents
-    True
+    >>> row = find_tags_by_class(anon_browser.contents, 'import_entry_row')[1]
+    >>> print extract_text(row.find('', 'import_source'))
+    po/es.po in Mozilla Firefox 1.0 series
+    >>> print extract_text(row.find('', 'import_status'))
+    Needs Review
 
 Some tarballs contain files whose names look like PO or POT files, but
 that are really editor backups whose name begin with a dot.  These are
@@ -131,9 +130,8 @@
   ...     'batch-navigation-index')
   >>> print extract_text(nav_index)
   1 &rarr; 5 of 5 results
-  >>> table = find_tag_by_id(anon_browser.contents, 'import-entries-list')
-  >>> last_row = table.findAll('tr')[10]
-  >>> print extract_text(last_row)
+  >>> rows = find_tags_by_class(anon_browser.contents, 'import_entry_row')
+  >>> print extract_text(rows[4])
   evolution.pot in
   evolution in Ubuntu Hoary
   Needs Review
@@ -208,7 +206,7 @@
 
 There is an option to remove entries from the queue.
 
-No Privileges Person will try to remove it, but will fail.
+No Privileges Person tries to remove entries but to no effect.
 
   >>> import urllib
   >>> post_data = urllib.urlencode(
@@ -226,9 +224,13 @@
   >>> user_browser.open(
   ...     'http://translations.launchpad.dev/+imports',
   ...     data=post_data)
-  Traceback (most recent call last):
-  ...
-  UnexpectedFormData...
+  >>> for status in find_tags_by_class(user_browser.contents, 'import_status'):
+  ...     print extract_text(status)
+  Approved
+  Approved
+  Imported
+  Imported
+  Needs Review
 
 But Jordi, a Rosetta expert, will be allowed to remove it.
 

=== modified file 'lib/lp/translations/templates/translation-import-queue-macros.pt'
--- lib/lp/translations/templates/translation-import-queue-macros.pt	2009-11-12 17:09:20 +0000
+++ lib/lp/translations/templates/translation-import-queue-macros.pt	2009-11-21 09:15:26 +0000
@@ -10,11 +10,12 @@
 >
 <body>
   <metal:translation-import-queue define-macro="translation-import-queue-content">
-    <script
-      type="text/javascript"
-      tal:condition="devmode"
-      tal:attributes="src string:${icingroot}/build/translations/translations.js">
-    </script>
+      <script type="text/javascript" tal:content="view/choice_confs_js" />
+      <script
+        type="text/javascript"
+        tal:condition="devmode"
+        tal:attributes="src string:${icingroot}/build/translations/translations.js">
+      </script>
 
       <script type="text/javascript">
           YUI().use( 'translations', 'event', function(Y) {
@@ -72,7 +73,7 @@
 
             <table id="import-entries-list" class="listing" width="100%">
               <tal:loop repeat="entry view/batchnav/currentBatch">
-                <tr tal:attributes="id entry/id">
+                <tr class="import_entry_row" tal:attributes="id entry/id">
                   <tal:XXX replace="nothing">
                     # XXX: CarlosPerelloMarin 2006-03-09 bug=34213
                     # We are using here
@@ -80,13 +81,10 @@
                     # sometimes, entry/import_into evaluates as false because
                     # __len__ method returns 0.
                   </tal:XXX>
-                  <td tal:condition="entry/import_into/title|nothing" rowspan="3">
-                    <span class="download sprite"></span>
-                  </td>
-                  <td tal:condition="not: entry/import_into/title|nothing" rowspan="2">
-                    <span class="download sprite"></span>
-                  </td>
-                  <td>
+                  <td rowspan="3">
+                    <span class="download sprite"></span>
+                  </td>
+                  <td class="import_source">
                     <a tal:attributes="href entry/content/http_url"
                        tal:content="entry/path">po/foo.pot</a> in
                     <a tal:condition="entry/sourcepackage"
@@ -96,21 +94,29 @@
                        tal:replace="structure entry/productseries/fmt:link">
                        Evolution Series: MAIN</a>
                   </td>
-                  <td tal:condition="entry/required:launchpad.Edit">
-                    <tal:status define="name string:status_${entry/id}"
-                                replace="structure view/widgets/?name" />
-                  </td>
-                  <td tal:condition="not: entry/required:launchpad.Edit"
-                      tal:content="entry/status/title">Needs Review
-                  </td>
-                  <td>
-                    <tal:block condition="entry/required:launchpad.Admin">
-                      <a class="sprite edit"
-                         tal:attributes="href entry/fmt:url">
-                        <span class="invisible-link">Change this entry</span>
-                      </a>
-                    </tal:block>
-                  </td>
+                  <tal:status define="css_status string:translationimportstatus${entry/status/name}"
+                              omit-tag="">
+                    <td class="import_status"
+                        tal:condition="entry/required:launchpad.Edit">
+                      <noscript>
+                        <tal:status define="name string:status_${entry/id}"
+                                    replace="structure view/widgets/?name" />
+                      </noscript>
+                      <span class="status-choice" style="display:none">
+                        <span tal:attributes="class string:value ${css_status}"
+                              tal:content="entry/status/title">
+                          Needs review</span>
+                        <img class="editicon" src="/@@/edit" />
+                      </span>
+                    </td>
+                    <td tal:condition="not: entry/required:launchpad.Edit"
+                        class="import_status">
+                        <span tal:attributes="class css_status"
+                               tal:content="entry/status/title">
+                            Needs Review
+                        </span>
+                    </td>
+                  </tal:status>
                   <td>
                     <tal:block condition="view/user">
                       <tal:comment replace="nothing">
@@ -140,12 +146,25 @@
                   # sometimes, entry/import_into evaluates as false because
                   # __len__ method returns 0.
                 </tal:XXX>
-                <tr tal:condition="entry/import_into/title|nothing" class="discreet secondary">
+                <tr class="discreet secondary">
                   <td colspan="3">
-                    Will be imported into 
-                    <a tal:content="entry/import_into/title"
-                       tal:attributes="href entry/import_into/fmt:url"
-                       >Foo</a>
+                    <span style="margin-right: 0.5em"
+                          tal:condition="entry/import_into/title|nothing" >
+                      Will be imported into 
+                      <a tal:content="entry/import_into/title"
+                         tal:attributes="href entry/import_into/fmt:url"
+                         >Foo</a>
+                    </span>
+                    <span style="margin-right: 0.5em"
+                          tal:condition="not:entry/import_into/title|nothing">
+                      No import target selected yet.
+                    </span>
+                    <tal:block condition="entry/required:launchpad.Admin">
+                      <a class="sprite edit"
+                         tal:attributes="href entry/fmt:url">
+                        <span class="invisible-link">Change this entry</span>
+                      </a>
+                    </tal:block>
                   </td>
                 </tr>
               </tal:loop>
@@ -158,10 +177,12 @@
                     tal:condition="script"
                     tal:content="structure script" />
             <tal:block define="user request/lp:person" condition="user">
-              <div class="actions">
-                <input
-                  tal:replace="structure view/change_status_action/render" />
-              </div>
+              <noscript>
+                <div class="actions">
+                  <input
+                    tal:replace="structure view/change_status_action/render" />
+                </div>
+              </noscript>
             </tal:block>
           </form>
         </tal:block>

=== modified file 'lib/lp/translations/tests/test_translationimportqueue.py'
--- lib/lp/translations/tests/test_translationimportqueue.py	2009-11-17 11:05:58 +0000
+++ lib/lp/translations/tests/test_translationimportqueue.py	2009-11-21 09:15:26 +0000
@@ -55,17 +55,11 @@
                  for status in possible_statuses])
 
     def test_canSetStatus_non_admin(self):
-        # A non-privileged users cannot set any status except for retaining
-        # the current status of an entry.
+        # A non-privileged users cannot set any status.
         some_user = self.factory.makePerson()
         self._assertCanSetStatus(some_user, self.entry,
             #  A      B      D      F      I     NR
-            [False, False, False, False, False, True])
-        self.entry.setStatus(
-            RosettaImportStatus.DELETED, self.rosetta_experts)
-        self._assertCanSetStatus(some_user, self.entry,
-            #  A      B      D     F      I     NR
-            [False, False, True, False, False, False])
+            [False, False, False, False, False, False])
 
     def test_canSetStatus_rosetta_expert(self):
         # Rosetta experts are all-powerful, didn't you know that?
@@ -118,7 +112,7 @@
         self._setUpUbuntu()
         self._assertCanSetStatus(self.ubuntu_group_owner, self.entry,
             #  A      B      D      F      I     NR
-            [False, False, False, False, False, True])
+            [False, False, False, False, False, False])
 
 
 def test_suite():

=== modified file 'lib/lp/translations/windmill/tests/test_import_queue.py'
--- lib/lp/translations/windmill/tests/test_import_queue.py	2009-10-30 17:09:59 +0000
+++ lib/lp/translations/windmill/tests/test_import_queue.py	2009-11-21 09:15:26 +0000
@@ -6,9 +6,18 @@
 __metaclass__ = type
 __all__ = []
 
+import transaction
+
 from windmill.authoring import WindmillTestClient
+from zope.component import getUtility
+from zope.security.proxy import removeSecurityProxy
 
+from canonical.launchpad.windmill.testing.constants import (
+    FOR_ELEMENT, PAGE_LOAD, SLEEP)
 from canonical.launchpad.windmill.testing import lpuser
+from canonical.launchpad.windmill.testing.lpuser import login_person
+from lp.translations.interfaces.translationimportqueue import (
+    ITranslationImportQueue)
 from lp.translations.windmill.testing import TranslationsWindmillLayer
 from lp.testing import TestCaseWithFactory
 
@@ -69,7 +78,7 @@
         user = lpuser.TRANSLATIONS_ADMIN
         # Go to import queue page logged in as translations admin.
         client.open(url=start_url)
-        client.waits.forPageLoad(timeout=u'20000')
+        client.waits.forPageLoad(timeout=PAGE_LOAD)
         user.ensure_login(client)
 
         # When the page is first called the file_type is set to POT and
@@ -90,3 +99,86 @@
         client.select(id=u'field.file_type', val=u'UNSPEC')
         self._assertAllFieldsHidden(client, 'POT')
         self._assertAllFieldsHidden(client, 'PO')
+
+
+IMPORT_STATUS = u"//tr[@id='%d']//span[contains(@class,'status-choice')]"
+IMPORT_STATUS_1 = IMPORT_STATUS % 1
+OPEN_CHOICELIST = u"//div[contains(@class, 'yui-ichoicelist-content')]"
+
+class ImportQueueStatusTest(TestCaseWithFactory):
+    """Test that the entries in the import queue can switch types."""
+
+    layer = TranslationsWindmillLayer
+
+    def test_import_queue_status_admin(self):
+        """Tests that the admin can use the status picker."""
+        client = WindmillTestClient('Translations import queue status')
+        queue_url = self.layer.base_url+'/+imports'
+        user = lpuser.TRANSLATIONS_ADMIN
+        # Go to import queue page logged in as translations admin.
+        client.open(url=queue_url)
+        client.waits.forPageLoad(timeout=PAGE_LOAD)
+        user.ensure_login(client)
+
+        # Click on the element containing the import status.
+        client.waits.forElement(xpath=IMPORT_STATUS_1, timeout=FOR_ELEMENT)
+        client.click(xpath=IMPORT_STATUS_1)
+        client.waits.forElement(xpath=OPEN_CHOICELIST)
+
+        # Change the status to deleted.
+        client.click(link=u'Deleted')
+        client.waits.sleep(milliseconds=SLEEP)
+        client.asserts.assertText(xpath=IMPORT_STATUS_1, validator=u'Deleted')
+
+        # Reload the page and make sure the change sticks.
+        client.open(url=queue_url)
+        client.waits.forPageLoad(timeout=PAGE_LOAD)
+        client.waits.forElement(xpath=IMPORT_STATUS_1, timeout=FOR_ELEMENT)
+        client.asserts.assertText(xpath=IMPORT_STATUS_1, validator=u'Deleted')
+
+    def test_import_queue_status_nopriv(self):
+        """Tests that a none-admin will have less choices."""
+        client = WindmillTestClient('Translations import queue status')
+        queue_url = self.layer.base_url+'/+imports'
+        hubert = self.factory.makePerson(
+            name="hubert", displayname="Hubert Hunt", password="test",
+            email="[e-mail]")
+        # Create a project and an import entry with it.
+        product = self.factory.makeProduct(owner=hubert)
+        removeSecurityProxy(product).official_rosetta = True
+        productseries = product.getSeries('trunk')
+        queue = getUtility(ITranslationImportQueue)
+        potemplate = self.factory.makePOTemplate(productseries=productseries)
+        entry = queue.addOrUpdateEntry(
+            'template.pot', '# POT content', False, hubert,
+            productseries=productseries, potemplate=potemplate)
+        transaction.commit()
+        import_status = IMPORT_STATUS % entry.id
+
+        # Go to import queue page logged in as a normal user.
+        client.open(url=queue_url)
+        client.waits.forPageLoad(timeout=PAGE_LOAD)
+        login_person(hubert, "test", client)
+
+        # There should be no status picker for entry 1.
+        client.waits.forElement(xpath=import_status, timeout=FOR_ELEMENT)
+        client.asserts.assertNotNode(xpath=IMPORT_STATUS_1)
+
+        # Click on the element containing the import status.
+        client.click(xpath=import_status)
+        client.waits.forElement(xpath=OPEN_CHOICELIST)
+
+        # There should be a link for Deleted but none for approved.
+        client.asserts.assertNode(link=u'Deleted')
+        client.asserts.assertNotNode(link=u'Approved')
+
+        # Change the status to deleted.
+        client.click(link=u'Deleted')
+        client.waits.sleep(milliseconds=SLEEP)
+        client.asserts.assertText(xpath=import_status, validator=u'Deleted')
+
+        # Reload the page and make sure the change sticks.
+        client.open(url=queue_url)
+        client.waits.forPageLoad(timeout=PAGE_LOAD)
+        client.waits.forElement(xpath=import_status, timeout=FOR_ELEMENT)
+        client.asserts.assertText(xpath=import_status, validator=u'Deleted')