Merge lp:~stevenk/launchpad/one-recipe-redirect into lp:launchpad

[Steve Kowalik]

[r=leonardr][ui=none][bug=704080] If there is only one recipe for a product/person, redirect straight to their recipe.

If there is only one recipe for a product/person, redirect straight to the recipe rather than a listing of recipes.

[Leonard Richardson (leonardr)]

review: Approve

=== modified file 'lib/lp/code/browser/sourcepackagerecipelisting.py'
--- lib/lp/code/browser/sourcepackagerecipelisting.py	2011-01-13 23:09:48 +0000
+++ lib/lp/code/browser/sourcepackagerecipelisting.py	2011-01-22 00:15:29 +0000
@@ -15,6 +15,7 @@
 
 from canonical.launchpad.browser.feeds import FeedsMixin
 from canonical.launchpad.webapp import (
+    canonical_url,
     LaunchpadView,
     Link,
     )
@@ -47,6 +48,13 @@
         return 'Source Package Recipes for %(displayname)s' % {
             'displayname': self.context.displayname}
 
+    def initialize(self):
+        super(RecipeListingView, self).initialize()
+        recipes = self.context.getRecipes()
+        if recipes.count() == 1:
+            recipe = recipes.one()
+            self.request.response.redirect(canonical_url(recipe))
+
 
 class BranchRecipeListingView(RecipeListingView):
 
 
=== modified file 'lib/lp/code/browser/tests/test_recipebuildslisting.py'
--- lib/lp/code/browser/tests/test_recipebuildslisting.py	2011-01-13 23:47:34 +0000
+++ lib/lp/code/browser/tests/test_recipebuildslisting.py	2011-01-22 00:15:29 +0000
@@ -13,6 +13,7 @@
     find_tag_by_id,
     )
 from canonical.launchpad.webapp.interfaces import ILaunchpadRoot
+from canonical.launchpad.webapp.publisher import canonical_url
 from canonical.testing.layers import DatabaseFunctionalLayer
 from lp.testing import (
     ANONYMOUS,
@@ -191,3 +192,13 @@
             text = extract_text(row)
             view_records_text.add(text.replace(' ', '').replace('\n', ''))
         self.assertEquals(records_text, view_records_text)
+
+    def test_one_recipe_redirects_to_recipe_page(self):
+        # Ensure that if the product or person has only one recipe, they are
+        # redirected right to the recipe page.
+        recipe = self.factory.makeSourcePackageRecipe()
+        root_url = self.layer.appserver_root_url(facet='code')
+        recipes_url = '%s/~%s/+recipes' % (root_url, recipe.owner.name)
+        expected_url = canonical_url(recipe)
+        browser = self.getUserBrowser(recipes_url)
+        self.assertEquals(expected_url, browser.url)
 
=== modified file 'lib/lp/code/browser/tests/test_sourcepackagerecipelisting.py'
--- lib/lp/code/browser/tests/test_sourcepackagerecipelisting.py	2010-10-04 19:50:45 +0000
+++ lib/lp/code/browser/tests/test_sourcepackagerecipelisting.py	2011-01-22 00:15:29 +0000
@@ -15,8 +15,11 @@
     layer = DatabaseFunctionalLayer
 
     def test_project_branch_recipe_listing(self):
+        # We can see recipes for the product. We need to create two, since
+        # only one will redirect to that recipe.
         branch = self.factory.makeProductBranch()
         recipe = self.factory.makeSourcePackageRecipe(branches=[branch])
+        recipe2 = self.factory.makeSourcePackageRecipe(branches=[branch])
         text = self.getMainText(recipe.base_branch, '+recipes')
         self.assertTextMatchesExpressionIgnoreWhitespace("""
             Source Package Recipes for lp:.*
@@ -24,8 +27,11 @@
             generic-string.*  Person-name""", text)
 
     def test_package_branch_recipe_listing(self):
+        # We can see recipes for the package. We need to create two, since
+        # only one will redirect to that recipe.
         branch = self.factory.makePackageBranch()
         recipe = self.factory.makeSourcePackageRecipe(branches=[branch])
+        recipe2 = self.factory.makeSourcePackageRecipe(branches=[branch])
         text = self.getMainText(recipe.base_branch, '+recipes')
         self.assertTextMatchesExpressionIgnoreWhitespace("""
             Source Package Recipes for lp:.*