Merge lp:~michael.nelson/ubuntu-webcatalog/987838-no-screenshot-for-extras into lp:ubuntu-webcatalog

[Michael Nelson]

application_screenshots no longer dependent on redundant data (is_latest).

Ensures that the application_screenshots view is not dependent on redundant data (is_latest).

Another part of the fix for this should be ensuring that the check_all_latest command is run after each import (import_app_install_data and import_for_purchase), but I want to check with achuni about that first as it looks like the kind of command we wouldn't want to run unnecessarily (ie. after each import of a distroseries, but rather after importing all distroseries - which may be why it's been left manual).

`fab test`

[Łukasz Czyżykowski (lukasz-czyzykowski)]

LGTM

review: Approve

=== modified file 'src/webcatalog/tests/test_views.py'
--- src/webcatalog/tests/test_views.py	2012-05-04 10:20:34 +0000
+++ src/webcatalog/tests/test_views.py	2012-05-07 09:12:19 +0000
@@ -1065,6 +1065,20 @@
 
         self.assertEqual(200, response.status_code)
 
+    @patch('webcatalog.utilities.urllib.urlopen')
+    def test_not_dependent_on_is_latest(self, mock_urlopen):
+        lucid = self.factory.make_distroseries(code_name='lucid')
+        maverick = self.factory.make_distroseries(code_name='maverick')
+        self.factory.make_application(package_name='foo', distroseries=lucid,
+            is_latest=False)
+        self.factory.make_application(package_name='foo',
+            distroseries=maverick, is_latest=False)
+
+        response = self.client.get(reverse('wc-package-screenshots',
+            args=['foo']))
+
+        self.assertEqual(200, response.status_code)
+
 
 class ApplicationRecommendsTestCase(TestCaseWithFactory):
 
 
=== modified file 'src/webcatalog/views.py'
--- src/webcatalog/views.py	2012-04-20 16:57:50 +0000
+++ src/webcatalog/views.py	2012-05-07 09:12:19 +0000
@@ -233,8 +233,7 @@
 
 
 def application_screenshots(request, package_name):
-    app = get_object_or_404(Application, package_name=package_name,
-        is_latest=True)
+    app = Application.objects.find_best_or_404(package_name=package_name)
     screenshots = WebServices().get_screenshots_for_package(package_name)
     return HttpResponse(json.dumps(screenshots),
         mimetype='application/json')