Merge lp:~stevenk/launchpad/archive-picker-value into lp:launchpad

[Steve Kowalik]

[r=benji][bug=719795] Move the owner/name text for the daily build archive picker to the second line.

Change the picker used by the daily build archive field to move the text in brackets to the second line.

This is not tested at all, but it seems that none of the PickerEntry infrastructure is tested at all.

[Benji York (benji)]

Looks good.

review: Approve (code)

=== modified file 'lib/lp/app/browser/configure.zcml'
--- lib/lp/app/browser/configure.zcml	2011-06-10 18:34:34 +0000
+++ lib/lp/app/browser/configure.zcml	2011-06-29 21:46:57 +0000
@@ -414,6 +414,10 @@
     factory="lp.app.browser.vocabulary.SourcePackageNamePickerEntryAdapter"
     />
 
+  <adapter
+    factory="lp.app.browser.vocabulary.ArchivePickerEntryAdapter"
+    />
+
   <!-- TALES namespaces. -->
 
   <!-- TALES lp: namespace (should be deprecated) -->

=== modified file 'lib/lp/app/browser/vocabulary.py'
--- lib/lp/app/browser/vocabulary.py	2011-06-03 12:26:05 +0000
+++ lib/lp/app/browser/vocabulary.py	2011-06-29 21:46:57 +0000
@@ -42,6 +42,7 @@
 from lp.registry.model.pillaraffiliation import IHasAffiliation
 from lp.registry.model.sourcepackagename import getSourcePackageDescriptions
 from lp.services.features import getFeatureFlag
+from lp.soyuz.interfaces.archive import IArchive
 
 # XXX: EdwinGrubbs 2009-07-27 bug=405476
 # This limits the output to one line of text, since the sprite class
@@ -186,6 +187,18 @@
         return extra
 
 
+@adapter(IArchive)
+class ArchivePickerEntryAdapter(DefaultPickerEntryAdapter):
+    """Adapts IArchive to IPickerEntry."""
+
+    def getPickerEntry(self, associated_object, **kwarg):
+        archive = self.context
+        extra = super(ArchivePickerEntryAdapter, self).getPickerEntry(
+            associated_object)
+        extra.description = '%s/%s' % (archive.owner.name, archive.name)
+        return extra
+
+
 class HugeVocabularyJSONView:
     """Export vocabularies as JSON.
 

=== modified file 'lib/lp/code/browser/tests/test_sourcepackagerecipe.py'
--- lib/lp/code/browser/tests/test_sourcepackagerecipe.py	2011-05-27 21:12:25 +0000
+++ lib/lp/code/browser/tests/test_sourcepackagerecipe.py	2011-06-29 21:46:57 +0000
@@ -1348,7 +1348,7 @@
             cake_recipe
             Request builds for cake_recipe
             Archive:
-            Secret PPA (chef/ppa)
+            Secret PPA
             Distribution series:
             Secret Squirrel
             Hoary

=== modified file 'lib/lp/soyuz/browser/archive.py'
--- lib/lp/soyuz/browser/archive.py	2011-06-29 14:43:34 +0000
+++ lib/lp/soyuz/browser/archive.py	2011-06-29 21:46:57 +0000
@@ -1387,7 +1387,7 @@
     terms = []
     for archive in archives:
         token = '%s/%s' % (archive.owner.name, archive.name)
-        label = '%s (%s)' % (archive.displayname, token)
+        label = archive.displayname
         terms.append(SimpleTerm(archive, token, label))
     return SimpleVocabulary(terms)
 

=== modified file 'lib/lp/soyuz/browser/tests/archive-views.txt'
--- lib/lp/soyuz/browser/tests/archive-views.txt	2011-06-28 14:43:13 +0000
+++ lib/lp/soyuz/browser/tests/archive-views.txt	2011-06-29 21:46:57 +0000
@@ -1252,7 +1252,7 @@
 
     >>> for item in archive_widget.vocabulary:
     ...     print item.title
-    PPA for Ubuntu Team (ubuntu-team/ppa)
+    PPA for Ubuntu Team
 
     >>> print archive_widget.getInputValue() == cprov.archive
     True
@@ -1302,8 +1302,8 @@
 
     >>> for item in archive_widget.vocabulary:
     ...     print item.title
-    PPA for Celso Providelo (cprov/ppa)
-    PPA for No Privileges Person (no-priv/ppa)
+    PPA for Celso Providelo
+    PPA for No Privileges Person
 
     >>> print archive_widget.getInputValue()
     Traceback (most recent call last):

=== modified file 'lib/lp/soyuz/stories/ppa/xx-copy-packages.txt'
--- lib/lp/soyuz/stories/ppa/xx-copy-packages.txt	2011-01-29 00:19:18 +0000
+++ lib/lp/soyuz/stories/ppa/xx-copy-packages.txt	2011-06-29 21:46:57 +0000
@@ -202,7 +202,7 @@
 
     >>> print jblack_browser.getControl(
     ...     'Destination PPA').displayOptions
-    ['PPA for James Blackwell (jblack/ppa)']
+    ['PPA for James Blackwell']
 
     >>> print jblack_browser.getControl(
     ...     'Destination PPA').value
@@ -699,7 +699,7 @@
 
     >>> print jblack_browser.getControl(
     ...     'Destination PPA').displayOptions
-    ['PPA for James Blackwell (jblack/ppa)', 'PPA for James Blackwell Friends (jblack-friends/ppa)']
+    ['PPA for James Blackwell', 'PPA for James Blackwell Friends']
 
 James wants to populate the PPA for James Blackwell Friends, he
 selects that.