diff --git a/apps/addons/templates/addons/details_box.html b/apps/addons/templates/addons/details_box.html index b7416fdc4b..56b69731ec 100644 --- a/apps/addons/templates/addons/details_box.html +++ b/apps/addons/templates/addons/details_box.html @@ -52,7 +52,26 @@ {{ addon.compatible_apps[APP] }} {% endif %} - {# XXX future feature: 'Depends on' ... #} + {% set deps = addon.all_dependencies %} + {% if deps %} + + + {% if addon.is_webapp() %} + {{ _('Required Apps') }} + {% else %} + {{ _('Required Add-ons') }} + {% endif %} + + + + + + {% endif %} {# XXX future feature: 'Localizations' ... #} {{ _('Rating', 'advanced_search_form_rating') }} diff --git a/apps/editors/tests/test_views.py b/apps/editors/tests/test_views.py index f2ed89ab9a..aae7efa7e4 100644 --- a/apps/editors/tests/test_views.py +++ b/apps/editors/tests/test_views.py @@ -18,7 +18,7 @@ import amo.tests from amo.urlresolvers import reverse from amo.tests import formset, initial from abuse.models import AbuseReport -from addons.models import Addon, AddonUser +from addons.models import Addon, AddonDependency, AddonUser from applications.models import Application from devhub.models import ActivityLog from editors.models import EditorSubscription, EventLog @@ -1384,6 +1384,7 @@ class ReviewBase(QueueTest): class TestReview(ReviewBase): + def setUp(self): super(TestReview, self).setUp() AddonUser.objects.create(addon=self.addon, @@ -1739,6 +1740,15 @@ class TestReview(ReviewBase): addon_files=[version.files.all()[0].pk]) self.client.post(url, d) + def test_dependencies_listed(self): + AddonDependency.objects.create(addon=self.addon, + dependent_addon=self.addon) + r = self.client.get(self.url) + deps = pq(r.content)('#addon-summary .addon-dependencies') + eq_(deps.length, 1) + eq_(deps.find('li').length, 1) + eq_(deps.find('a').attr('href'), self.addon.get_url_path()) + def test_eula_displayed(self): assert not self.addon.eula r = self.client.get(self.url) diff --git a/media/css/zamboni/editors.css b/media/css/zamboni/editors.css index ef7f820eaa..784e7ea53a 100644 --- a/media/css/zamboni/editors.css +++ b/media/css/zamboni/editors.css @@ -103,6 +103,9 @@ padding: 6em 1em; font-size: 1.1em; } +table ul { + margin: 0; +} table.data-grid { width: 100%; margin-bottom: 0;