Merge lp:~michael.nelson/ubuntu-webcatalog/fix-recommends-multiple-apps into lp:ubuntu-webcatalog

[Michael Nelson]

Ensure the recommends view handles the same app in multiple series.

Ensure the recommends view handles the same app in multiple series.

[Anthony Lenton (elachuni)]

Looks fine.

review: Approve

=== modified file 'src/webcatalog/tests/test_views.py'
--- src/webcatalog/tests/test_views.py	2012-04-19 23:05:19 +0000
+++ src/webcatalog/tests/test_views.py	2012-04-20 14:43:18 +0000
@@ -1117,6 +1117,16 @@
         self.assertTemplateUsed(
             response, 'webcatalog/recommended_apps_widget.html')
 
+    def test_handles_multiple_versions_of_app(self):
+        # Same app in two distroseries.
+        app = self.factory.make_application(package_name='firefox')
+        app2 = self.factory.make_application(package_name='firefox')
+
+        response = self.client.get(
+            reverse('wc-package-recommends', args=['firefox']),
+                HTTP_X_REQUESTED_WITH='XMLHttpRequest')
+
+        self.assertEqual(app2, response.context['application'])
 
 class ComboViewTestCase(TestCase):
     """Tests for ComboView."""

=== modified file 'src/webcatalog/views.py'
--- src/webcatalog/views.py	2012-04-19 21:55:25 +0000
+++ src/webcatalog/views.py	2012-04-20 14:43:18 +0000
@@ -215,7 +215,7 @@
 
 @vary_on_headers('X_REQUESTED_WITH')
 def application_recommends(request, package_name):
-    app = get_object_or_404(Application, package_name=package_name)
+    app = Application.objects.find_best_or_404(package_name=package_name)
 
     recommends = WebServices().get_recommends_for_package(package_name)