Merge lp:~michael.nelson/ubuntu-webcatalog/987851-display-multiple-apps-from-banner into lp:ubuntu-webcatalog

[Michael Nelson]

Support exhibit links for multiple packages.

Overview
========

Adds an /applications/?pkg_name=foo&pkg_name=bar view which will display multiple packages from the url data.

Updates Exhibit.destination_url to use this new view.

`fab test`

You can demo locally by importing exhibits from production and clicking on the book exhibit. The result will look like this (note: icons not imported on my local machine).

http://people.canonical.com/~michaeln/tmp/987851-application-list-view.png

[ISD Branch Mangler (isd-branches-mangler)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

=== modified file 'src/webcatalog/models/applications.py'
--- src/webcatalog/models/applications.py	2012-05-04 12:11:56 +0000
+++ src/webcatalog/models/applications.py	2012-05-08 06:45:21 +0000
@@ -273,7 +273,13 @@
         app_label = 'webcatalog'
 
     def destination_url(self):
-        package = self.package_names.split(',')[0]
-        if not package:
-            return ''
-        return reverse('wc-package-detail', kwargs={'package_name': package})
+        pkg_names = self.package_names.split(',')
+        if len(pkg_names) == 1:
+            pkg_name = pkg_names[0]
+            if not pkg_name:
+                return ''
+            return reverse('wc-package-detail',
+                kwargs={'package_name': pkg_name})
+
+        return reverse('wc-package-list') + '?' + '&'.join(
+            ['pkg_name=%s' % pkg_name for pkg_name in pkg_names])
 
=== added file 'src/webcatalog/templates/webcatalog/application_list.html'
--- src/webcatalog/templates/webcatalog/application_list.html	1970-01-01 00:00:00 +0000
+++ src/webcatalog/templates/webcatalog/application_list.html	2012-05-08 06:45:21 +0000
@@ -0,0 +1,30 @@
+{% extends "webcatalog/base.html" %}
+{% load i18n %}
+
+{% block title %}{% trans "Ubuntu Apps Directory" %}{% endblock %}
+{% block header %}Applications{% endblock %}
+
+{% block content %}
+
+<div id="leftbar">
+    <div class="portlet">
+        <div class="portletheader">App departments</div>
+        <ul class="portletactions">
+{% for dept in depts %}
+    {% include "webcatalog/department_overview_snippet.html" %}
+{% endfor %}
+        </ul>
+    </div>
+</div>
+
+<div class="main-column">
+    {% include "webcatalog/breadcrumbs_snippet.html" %}
+
+{% if applications %}
+    {% include "webcatalog/application_list_snippet.html" %}
+{% else %}
+<h4 class="not-found">{% trans "No applications found." %}</p>
+{% endif %}
+</div>
+
+{% endblock %}
 
=== renamed file 'src/webcatalog/templates/webcatalog/application_overview_snippet.html' => 'src/webcatalog/templates/webcatalog/application_list_snippet.html'
=== modified file 'src/webcatalog/templates/webcatalog/department_overview.html'
--- src/webcatalog/templates/webcatalog/department_overview.html	2012-04-11 14:09:10 +0000
+++ src/webcatalog/templates/webcatalog/department_overview.html	2012-05-08 06:45:21 +0000
@@ -41,7 +41,7 @@
 {% if page.object_list %}
 {% include "webcatalog/batch_navigation.html" %}
 {% with applications=page.object_list %}
-    {% include "webcatalog/application_overview_snippet.html" %}
+    {% include "webcatalog/application_list_snippet.html" %}
 {% endwith %}
 {% include "webcatalog/batch_navigation.html" %}
 {% else %}
 
=== modified file 'src/webcatalog/templates/webcatalog/search_results.html'
--- src/webcatalog/templates/webcatalog/search_results.html	2012-04-05 01:14:34 +0000
+++ src/webcatalog/templates/webcatalog/search_results.html	2012-05-08 06:45:21 +0000
@@ -29,7 +29,7 @@
 {% if page.object_list %}
 {% include "webcatalog/batch_navigation.html" %}
 {% with applications=page.object_list %}
-    {% include "webcatalog/application_overview_snippet.html" %}
+    {% include "webcatalog/application_list_snippet.html" %}
 {% endwith  %}
 {% include "webcatalog/batch_navigation.html" %}
 {% else %}
 
=== modified file 'src/webcatalog/tests/test_models.py'
--- src/webcatalog/tests/test_models.py	2012-05-04 09:31:50 +0000
+++ src/webcatalog/tests/test_models.py	2012-05-08 06:45:21 +0000
@@ -237,7 +237,8 @@
 
     def test_destination_url_multiple_packages(self):
         exhibit = self.factory.make_exhibit(package_names='foobar,baz')
-        expected = reverse('wc-package-detail', args=['foobar'])
+        expected = reverse('wc-package-list') + (
+                '?pkg_name=foobar&pkg_name=baz')
         self.assertEqual(expected, exhibit.destination_url())
 
     def test_destination_url_blank_packages(self):
 
=== modified file 'src/webcatalog/tests/test_views.py'
--- src/webcatalog/tests/test_views.py	2012-05-07 09:06:44 +0000
+++ src/webcatalog/tests/test_views.py	2012-05-08 06:45:21 +0000
@@ -36,7 +36,10 @@
 from mock import patch
 from rnrclient import ReviewDetails
 
-from webcatalog.models import DistroSeries
+from webcatalog.models import (
+    Department,
+    DistroSeries,
+    )
 from webcatalog.tests.factory import TestCaseWithFactory
 from webcatalog.tests.helpers import patch_settings
 
@@ -44,6 +47,7 @@
 __all__ = [
     'ApplicationDetailNoSeriesTestCase',
     'ApplicationDetailTestCase',
+    'ApplicationListTestCase',
     'ApplicationRecommendsTestCase',
     'ApplicationReviewsTestCase',
     'ApplicationScreenshotsTestCase',
@@ -398,6 +402,36 @@
         self.assertEqual(natty, used.distroseries)
 
 
+class ApplicationListTestCase(TestCaseWithFactory):
+    def test_no_args_redirects_to_index(self):
+        response = self.client.get(reverse('wc-package-list'))
+
+        self.assertRedirects(response, reverse('wc-index'))
+
+    def test_includes_apps_for_pkg_names(self):
+        apps = [
+            self.factory.make_application(),
+            self.factory.make_application(),
+            self.factory.make_application(),
+            ]
+
+        response = self.client.get(
+            reverse('wc-package-list') + '?' + "&".join(
+                ['pkg_name=%s' % app.package_name for app in apps]))
+
+        self.assertEqual(200, response.status_code)
+        self.assertEqual(apps, response.context['applications'])
+
+    def test_includes_depts_in_context(self):
+        depts = Department.objects.filter(parent=None).order_by('name')
+
+        response = self.client.get(
+            reverse('wc-package-list') + '?pkg_name=firefox')
+
+        self.assertEqual(200, response.status_code)
+        self.assertEqual(list(depts), list(response.context['depts']))
+
+
 class SearchTestCase(TestCaseWithFactory):
     def setUp(self):
         super(SearchTestCase, self).setUp()
 
=== modified file 'src/webcatalog/urls.py'
--- src/webcatalog/urls.py	2012-04-20 16:57:50 +0000
+++ src/webcatalog/urls.py	2012-05-08 06:45:21 +0000
@@ -36,6 +36,7 @@
         'department_overview', name='wc-department'),
     url(r'^department/(?P<dept_slug_or_id>[\w\d-]+)/$', 'department_overview',
         name='wc-department'),
+    url(r'^applications/$', 'application_list', name='wc-package-list'),
     url(r'^applications/screenshots/(?P<package_name>[-.+:\w]+)/$',
         'application_screenshots', name="wc-package-screenshots"),
     url(r'^applications/(?P<distro>[-.+\w]+)/(?P<package_name>[-.+:\w]+)/$',
 
=== modified file 'src/webcatalog/views.py'
--- src/webcatalog/views.py	2012-05-07 08:58:26 +0000
+++ src/webcatalog/views.py	2012-05-08 06:45:21 +0000
@@ -159,6 +159,26 @@
         context_instance=context)
 
 
+def application_list(request):
+    pkg_names = request.GET.getlist('pkg_name')
+    if not pkg_names:
+        # We have no need of a general paged view of apps here.
+        return HttpResponseRedirect(reverse('wc-index'))
+
+    applications = []
+    for pkg_name in pkg_names:
+        latest = Application.objects.find_best(
+            package_name=pkg_name)
+        if latest:
+            applications.append(latest)
+
+    depts = Department.objects.filter(parent=None).order_by('name')
+
+    return render_to_response('webcatalog/application_list.html',
+        context_instance=RequestContext(request,
+            dict(applications=applications, depts=depts)))
+
+
 def application_detail(request, package_name, distro=None):
     if distro is None:
         app = Application.objects.find_best_or_404(package_name=package_name)