Merge lp:~zematynnad/ubuntu-webcatalog/icons_944232 into lp:ubuntu-webcatalog

[Danny Tamez]

Add links to icons in search results and directory browsing.

OVERVIEW
========
This branch adds links to the icons already being displayed for applications in search results and category browsing.

DETAILS
========
The same link being used for the application name is being used for the icons. The change only needed to be made in one snippet since both pages use the same snippet.

TO TEST
=======
fab bootstrap test

[Michael Nelson (michael.nelson)]

Hi Danny,

We should at some point start using an html/xml parser to check out tests... but for the moment, updating the test to check for '<a href="...."' will pick up the small typo you've got on line 9 (<a eref="..) Otherwise, great stuff! I'll add an approve vote now so you can land it with the typo fixed.

review: Approve

[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/templates/webcatalog/application_overview_snippet.html'
--- src/webcatalog/templates/webcatalog/application_overview_snippet.html	2011-09-15 10:53:40 +0000
+++ src/webcatalog/templates/webcatalog/application_overview_snippet.html	2012-03-09 16:53:23 +0000
@@ -4,9 +4,9 @@
   <tr>
     <td class="app-icon">
     {% if app.icon %}
-        <img src="{{ app.icon.url }}" width="32" height="32" />
+    <a href="{% url wc-package-detail app.distroseries.code_name app.package_name %}"><img src="{{ app.icon.url }}" width="32" height="32"/></a>
     {% else %}
-        <img src="{{ STATIC_URL }}images/applications-other.png"/>
+    <a href="{% url wc-package-detail app.distroseries.code_name app.package_name %}"><img src="{{ STATIC_URL }}images/applications-other.png"/></a>
     {% endif %}
     </td>
     <td class="app-description">

=== modified file 'src/webcatalog/tests/test_views.py'
--- src/webcatalog/tests/test_views.py	2012-03-08 21:50:03 +0000
+++ src/webcatalog/tests/test_views.py	2012-03-09 16:53:23 +0000
@@ -373,6 +373,17 @@
             self.assertEquals(
                 expected[q], set(response.context['page'].object_list))
 
+    def test_search_includes_link_to_app(self):
+        distro = self.factory.make_distroseries(code_name='lucid')
+        app = self.factory.make_application(name='foo',
+            distroseries=distro)
+        url = reverse('wc-search', args=[distro.code_name])
+
+        response = self.client.get(url, data={'q': 'foo'})
+
+        self.assertContains(response, reverse('wc-package-detail',
+            args=[app.distroseries.code_name, app.package_name]), count=2)
+
     def test_search_no_apps_found_says_so(self):
         distro = self.factory.make_distroseries(code_name='lucid')
         url = reverse('wc-search', args=[distro.code_name])
@@ -535,7 +546,7 @@
             app.distroseries.code_name, dept.id]))
 
         self.assertContains(response, reverse('wc-package-detail',
-            args=[app.distroseries.code_name, app.package_name]))
+            args=[app.distroseries.code_name, app.package_name]), count=2)
 
     def test_department_with_no_subdepts_doesnt_contain_header(self):
         dept = self.factory.make_department('bar')