Merge lp:~michael.nelson/ubuntu-webcatalog/1045328-bundle-promotion-apps into lp:ubuntu-webcatalog

[Michael Nelson]

Add ApplicationWidget model for dynamic campaign widgets.

Overview
========

This branch adds the ApplicationWidget model which can be used to display custom widgets on any application detail page (see bug 1045328).

`fab test`

Notes:
 * I tried a few options for the model-admin, like tabularinline, but raw_id_field was the only way to *not* present the whole list of apps. The good thing is it presents lots of info about each app to decide, the bad thing is it results in a list of ids, which are opaque once set. We may want to investigate further if it is difficult to use.
 * I considered having a widget per application (implemented) and a widget per package_name (what the existing setting did). I went for the DB relationship on application, which is more general (ie. could potentially select only certain distroseries versions of an app to include the widget), but may be more fiddly to use (need to select multiple versions of each app).

[lp:~michael.nelson/ubuntu-webcatalog/1045328-bundle-promotion-apps]

174. By Michael Nelson on 2012-09-06

REFACTOR: Use inline for displaying widget on application.

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

review: Approve

=== modified file 'src/webcatalog/admin.py'
--- src/webcatalog/admin.py	2012-07-02 21:25:30 +0000
+++ src/webcatalog/admin.py	2012-09-06 14:09:20 +0000
@@ -23,6 +23,7 @@
 from webcatalog.models import (
     Application,
     ApplicationMedia,
+    ApplicationWidget,
     Department,
     DistroSeries,
     Exhibit,
@@ -36,12 +37,19 @@
 ]
 
 
+class ApplicationWidgetInline(admin.TabularInline):
+    model = ApplicationWidget.applications.through
+
+
 class ApplicationAdmin(admin.ModelAdmin):
     list_display = ('package_name', 'name', 'comment', 'distroseries',
                     'wilson_score')
     search_fields = ('package_name', 'name', 'comment')
     list_filter = ('distroseries', 'imported_from_sca', 'is_latest',
                    'departments')
+    inlines = [
+        ApplicationWidgetInline,
+    ]
 
 
 class MachineAdmin(admin.ModelAdmin):
@@ -66,8 +74,15 @@
     def distroseries(self, obj):
         return obj.application.distroseries
 
+
+class ApplicationWidgetAdmin(admin.ModelAdmin):
+    list_display = ('name', )
+    raw_id_fields = ('applications',)
+
+
 admin.site.register(Application, ApplicationAdmin)
 admin.site.register(ApplicationMedia, ApplicationMediaAdmin)
+admin.site.register(ApplicationWidget, ApplicationWidgetAdmin)
 admin.site.register(Department, DepartmentAdmin)
 admin.site.register(DistroSeries)
 admin.site.register(Exhibit, ExhibitAdmin)

=== added file 'src/webcatalog/migrations/0029_add_application_widget.py'
--- src/webcatalog/migrations/0029_add_application_widget.py	1970-01-01 00:00:00 +0000
+++ src/webcatalog/migrations/0029_add_application_widget.py	2012-09-06 14:09:20 +0000
@@ -0,0 +1,191 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        
+        # Adding model 'ApplicationWidget'
+        db.create_table('webcatalog_applicationwidget', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')(max_length=32)),
+            ('template_snippet', self.gf('django.db.models.fields.TextField')()),
+        ))
+        db.send_create_signal('webcatalog', ['ApplicationWidget'])
+
+        # Adding M2M table for field applications on 'ApplicationWidget'
+        db.create_table('webcatalog_applicationwidget_applications', (
+            ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
+            ('applicationwidget', models.ForeignKey(orm['webcatalog.applicationwidget'], null=False)),
+            ('application', models.ForeignKey(orm['webcatalog.application'], null=False))
+        ))
+        db.create_unique('webcatalog_applicationwidget_applications', ['applicationwidget_id', 'application_id'])
+
+
+    def backwards(self, orm):
+        
+        # Deleting model 'ApplicationWidget'
+        db.delete_table('webcatalog_applicationwidget')
+
+        # Removing M2M table for field applications on 'ApplicationWidget'
+        db.delete_table('webcatalog_applicationwidget_applications')
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'webcatalog.application': {
+            'Meta': {'ordering': "('-wilson_score', 'name')", 'unique_together': "(('distroseries', 'package_name'),)", 'object_name': 'Application'},
+            'app_type': ('django.db.models.fields.CharField', [], {'max_length': '32', 'blank': 'True'}),
+            'architectures': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'archive_id': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '64', 'null': 'True', 'blank': 'True'}),
+            'categories': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'channel': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'comment': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'debtags': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'departments': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['webcatalog.Department']", 'symmetrical': 'False', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'distroseries': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.DistroSeries']"}),
+            'icon': ('django.db.models.fields.files.ImageField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'icon_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'imported_from_sca': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_latest': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'keywords': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'license': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}),
+            'mimetype': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'package_name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'popcon': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'price': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '7', 'decimal_places': '2', 'blank': 'True'}),
+            'ratings_average': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '3', 'decimal_places': '2', 'blank': 'True'}),
+            'ratings_histogram': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'}),
+            'ratings_total': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'section': ('django.db.models.fields.CharField', [], {'max_length': '32', 'blank': 'True'}),
+            'version': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}),
+            'wilson_score': ('django.db.models.fields.FloatField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'})
+        },
+        'webcatalog.applicationmedia': {
+            'Meta': {'ordering': "('url',)", 'unique_together': "(('application', 'url'),)", 'object_name': 'ApplicationMedia'},
+            'application': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.Application']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'media_type': ('django.db.models.fields.CharField', [], {'max_length': '16'}),
+            'url': ('django.db.models.fields.URLField', [], {'max_length': '200'})
+        },
+        'webcatalog.applicationwidget': {
+            'Meta': {'object_name': 'ApplicationWidget'},
+            'applications': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['webcatalog.Application']", 'symmetrical': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
+            'template_snippet': ('django.db.models.fields.TextField', [], {})
+        },
+        'webcatalog.consumer': {
+            'Meta': {'object_name': 'Consumer'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'key': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'secret': ('django.db.models.fields.CharField', [], {'default': "'WYDKgmMYvbPrqsjqWjFpMMVGEfHfHS'", 'max_length': '255', 'blank': 'True'}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'oauth_consumer'", 'unique': 'True', 'to': "orm['auth.User']"})
+        },
+        'webcatalog.department': {
+            'Meta': {'object_name': 'Department'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.Department']", 'null': 'True', 'blank': 'True'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50', 'db_index': 'True'})
+        },
+        'webcatalog.distroseries': {
+            'Meta': {'object_name': 'DistroSeries'},
+            'code_name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'prerelease': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'version': ('django.db.models.fields.CharField', [], {'max_length': '10', 'blank': 'True'})
+        },
+        'webcatalog.exhibit': {
+            'Meta': {'object_name': 'Exhibit'},
+            'banner_url': ('django.db.models.fields.CharField', [], {'max_length': '1024'}),
+            'click_url': ('django.db.models.fields.URLField', [], {'default': "''", 'max_length': '200'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'display': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+            'distroseries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['webcatalog.DistroSeries']", 'symmetrical': 'False'}),
+            'html': ('django.db.models.fields.TextField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'package_names': ('django.db.models.fields.CharField', [], {'max_length': '1024'}),
+            'published': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'sca_id': ('django.db.models.fields.IntegerField', [], {}),
+            'weight': ('django.db.models.fields.IntegerField', [], {'default': '0'})
+        },
+        'webcatalog.machine': {
+            'Meta': {'unique_together': "(('owner', 'uuid'),)", 'object_name': 'Machine'},
+            'hostname': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'logo_checksum': ('django.db.models.fields.CharField', [], {'max_length': '56', 'blank': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'package_list': ('django.db.models.fields.TextField', [], {}),
+            'packages_checksum': ('django.db.models.fields.CharField', [], {'max_length': '56'}),
+            'uuid': ('django.db.models.fields.CharField', [], {'max_length': '32', 'db_index': 'True'})
+        },
+        'webcatalog.nonce': {
+            'Meta': {'unique_together': "(('nonce', 'token', 'consumer'),)", 'object_name': 'Nonce'},
+            'consumer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.Consumer']"}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'nonce': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'token': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.Token']"})
+        },
+        'webcatalog.reviewstatsimport': {
+            'Meta': {'object_name': 'ReviewStatsImport'},
+            'distroseries': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.DistroSeries']", 'unique': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_import': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.utcnow'})
+        },
+        'webcatalog.token': {
+            'Meta': {'object_name': 'Token'},
+            'consumer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.Consumer']"}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'token': ('django.db.models.fields.CharField', [], {'default': "'pjfQGToPAEUjSRBWGoACORELAevZrhxtbALJSHxqfaXZAEtIym'", 'max_length': '50', 'primary_key': 'True'}),
+            'token_secret': ('django.db.models.fields.CharField', [], {'default': "'RbVwxdrIRcQnwdlszhxgeoFHoaLpOMUjZebJkAggzeKrAHGcHZ'", 'max_length': '50'}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['webcatalog']

=== modified file 'src/webcatalog/models/__init__.py'
--- src/webcatalog/models/__init__.py	2012-03-19 08:16:51 +0000
+++ src/webcatalog/models/__init__.py	2012-09-06 14:09:20 +0000
@@ -26,6 +26,7 @@
     'DistroSeries',
     'Application',
     'ApplicationMedia',
+    'ApplicationWidget',
     'Department',
     'Exhibit',
     'ReviewStatsImport',
@@ -36,6 +37,7 @@
 from .applications import (
     Application,
     ApplicationMedia,
+    ApplicationWidget,
     Department,
     DistroSeries,
     Exhibit,

=== modified file 'src/webcatalog/models/applications.py'
--- src/webcatalog/models/applications.py	2012-08-21 13:57:11 +0000
+++ src/webcatalog/models/applications.py	2012-09-06 14:09:20 +0000
@@ -41,6 +41,7 @@
 __all__ = [
     'Application',
     'ApplicationMedia',
+    'ApplicationWidget',
     'Department',
     'DistroSeries',
     'Exhibit',
@@ -314,6 +315,19 @@
         return reverse('wc-package-list') + '?' + pkgs
 
 
+class ApplicationWidget(models.Model):
+    name = models.CharField(max_length=32,
+                            help_text="Just a reference for the admin view.")
+    applications = models.ManyToManyField(Application)
+    template_snippet = models.TextField()
+
+    def __unicode__(self):
+        return self.name
+
+    class Meta:
+        app_label = 'webcatalog'
+
+
 # GroupPermissions can't go in fixtures because Permissions are stored as
 # model metadata, so our Permission's primary key can change without warning
 def post_syncdb_handler(sender, **kwargs):

=== modified file 'src/webcatalog/schema.py'
--- src/webcatalog/schema.py	2012-08-23 15:12:54 +0000
+++ src/webcatalog/schema.py	2012-09-06 14:09:20 +0000
@@ -66,8 +66,6 @@
         number_top_rated_apps = schema.IntOption(default=8)
         screenshots_base_url = schema.StringOption(
             default='http://screenshots.ubuntu.com/')
-        hib_apps = schema.ListOption(
-            item=schema.StringOption(), default=[])
         ubuntu_series_for_versions = schema.DictOption(
             item=schema.StringOption())
 

=== modified file 'src/webcatalog/templates/webcatalog/application_detail.html'
--- src/webcatalog/templates/webcatalog/application_detail.html	2012-06-28 13:48:45 +0000
+++ src/webcatalog/templates/webcatalog/application_detail.html	2012-09-06 14:09:20 +0000
@@ -109,12 +109,9 @@
       <p>{{ application.description|htmlize_package_description }}</p>
       <div class="install-button">{% install_options application %}</div>
     </div>
-    {% if display_hib_widget %}
-    <div id="hib-widget" style="width: 652px; padding:24px 16px 8px; clear:both">
-        <p>{{ application.name }} is currently also available as part of the <a href="http://www.humblebundle.com/?utm_source=ubuntu">Humble Bundle</a></p>
-    <iframe style="display: block; margin:0 auto; border:none;" src="http://www.humblebundle.com/_widget/html" width="410" height="150"></iframe>
-    </div>
-    {% endif %}
+    {% for widget in application.applicationwidget_set.all %}
+      {% render_app_widget widget.template_snippet %}
+    {% endfor %}
     <div class="license">
       <table>
         <tr>

=== modified file 'src/webcatalog/templatetags/webcatalog.py'
--- src/webcatalog/templatetags/webcatalog.py	2012-07-02 21:25:30 +0000
+++ src/webcatalog/templatetags/webcatalog.py	2012-09-06 14:09:20 +0000
@@ -32,6 +32,7 @@
 from django.utils.html import escape
 from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext as _
+from django.template import Template
 
 from webcatalog.models import Application
 from webcatalog.utilities import UserAgentString
@@ -196,3 +197,9 @@
 
     return dict(stars=stars, total=num_ratings,
                 STATIC_URL=settings.STATIC_URL, size=size)
+
+
[e-mail]_tag(takes_context=True)
+def render_app_widget(context, template_snippet):
+    template = Template(template_snippet)
+    return template.render(context)

=== modified file 'src/webcatalog/tests/factory.py'
--- src/webcatalog/tests/factory.py	2012-08-23 10:07:28 +0000
+++ src/webcatalog/tests/factory.py	2012-09-06 14:09:20 +0000
@@ -40,6 +40,7 @@
 from webcatalog.models import (
     Application,
     ApplicationMedia,
+    ApplicationWidget,
     Consumer,
     Department,
     DistroSeries,
@@ -250,6 +251,16 @@
             expire_date=expire_date
         )
 
+    def make_app_widget(self, applications=None, template_snippet=None):
+        if applications is None:
+            applications = [self.make_application()]
+        if template_snippet is None:
+            template_snippet = u"Promotion for {{ application.name }}"
+
+        widget = ApplicationWidget.objects.create(
+            template_snippet=template_snippet)
+        widget.applications = applications
+
 
 class TestCaseWithFactory(TestCase):
 

=== modified file 'src/webcatalog/tests/test_views.py'
--- src/webcatalog/tests/test_views.py	2012-07-02 21:25:30 +0000
+++ src/webcatalog/tests/test_views.py	2012-09-06 14:09:20 +0000
@@ -205,16 +205,43 @@
         self.assertContains(response, "https://twitter.com/share")
 
     def test_hib_widget_is_present_for_hib_apps(self):
-        with patch_settings(HIB_APPS=['pkgfoo']):
-            response, app = self.get_app_and_response()
-
-        self.assertContains(response, '<div id="hib-widget"')
+        app = self.factory.make_application(package_name='pkgfoo',
+                                            name=u'A great foo')
+        self.factory.make_app_widget(
+            applications=[app],
+            template_snippet=u"<p>Promotion for {{ application.name }}</p>")
+
+        response = self.get_package_details_response('pkgfoo')
+
+        self.assertContains(response, '<p>Promotion for A great foo</p>')
 
     def test_hib_widget_not_present_for_non_hib_apps(self):
-        with patch_settings(HIB_APPS=['something', 'different']):
-            response, app = self.get_app_and_response()
-
-        self.assertNotContains(response, '<div id="hib-widget"')
+        self.factory.make_application(package_name='pkgfoo',
+                                      name=u'A great foo')
+        other_app = self.factory.make_application(package_name='pkgbar',
+                                                  name=u'Another app')
+        self.factory.make_app_widget(
+            applications=[other_app],
+            template_snippet=u"Promotion for {{ application.name }}")
+
+        response = self.get_package_details_response('pkgfoo')
+
+        self.assertNotContains(response, 'Promotion for')
+
+    def test_multiple_promotions_for_app(self):
+        app = self.factory.make_application(package_name='pkgfoo',
+                                            name=u'A great foo')
+        self.factory.make_app_widget(
+            applications=[app],
+            template_snippet=u"Promotion X for {{ application.name }}")
+        self.factory.make_app_widget(
+            applications=[app],
+            template_snippet=u"Promotion Y for {{ application.name }}")
+
+        response = self.get_package_details_response('pkgfoo')
+
+        self.assertContains(response, 'Promotion X for A great foo')
+        self.assertContains(response, 'Promotion Y for A great foo')
 
     def test_twitter_link_does_not_contain_none(self):
         app = self.factory.make_application()

=== modified file 'src/webcatalog/views.py'
--- src/webcatalog/views.py	2012-07-02 21:25:30 +0000
+++ src/webcatalog/views.py	2012-09-06 14:09:20 +0000
@@ -219,8 +219,6 @@
 
     debtags = None if not app.debtags else json.loads(app.debtags)
 
-    hib_apps = getattr(settings, 'HIB_APPS', [])
-
     atts = {
         'application': app,
         'available_distroseries': app.available_distroseries(),
@@ -230,7 +228,6 @@
             reverse('wc-package-detail', args=[package_name])),
         'email_form': form,
         'debtags': debtags,
-        'display_hib_widget': app.package_name in hib_apps
     }
 
     return render_to_response(