diff --git a/apps/sponsors/models/benefits.py b/apps/sponsors/models/benefits.py index c2e88a39d..c4be21694 100644 --- a/apps/sponsors/models/benefits.py +++ b/apps/sponsors/models/benefits.py @@ -318,9 +318,9 @@ def user_edit_url(self): @property def user_view_url(self): - """Return the URL for sponsors to view this provided asset.""" - url = reverse("users:view_provided_sponsorship_assets", args=[self.sponsor_benefit.sponsorship.pk]) - return url + f"?provided_asset={self.pk}" + """Return the URL for sponsors to view the sponsorship's provided assets section.""" + url = reverse("users:sponsorship_application_detail", args=[self.sponsor_benefit.sponsorship.pk]) + return url + f"#provided-assets-info" class RequiredAssetMixin(AssetMixin): diff --git a/apps/sponsors/tests/test_asset_mixin.py b/apps/sponsors/tests/test_asset_mixin.py new file mode 100644 index 000000000..8d5d3ff14 --- /dev/null +++ b/apps/sponsors/tests/test_asset_mixin.py @@ -0,0 +1,21 @@ +from django.test import TestCase +from django.urls import reverse +from model_bakery import baker + +from apps.sponsors.models import SponsorBenefit, Sponsorship +from apps.sponsors.models.benefits import ProvidedTextAsset + + +class AssetMixinTests(TestCase): + def setUp(self): + self.sponsorship = baker.make(Sponsorship) + self.sponsor_benefit = baker.make(SponsorBenefit, sponsorship=self.sponsorship) + # ProvidedTextAsset inherits from ProvidedAssetMixin which inherits from AssetMixin + self.asset = baker.make(ProvidedTextAsset, sponsor_benefit=self.sponsor_benefit, internal_name="test_asset") + + def test_user_view_url_includes_anchor(self): + expected_url = reverse("users:sponsorship_application_detail", args=[self.sponsorship.pk]) + expected_url += "#provided-assets-info" + + self.assertEqual(self.asset.user_view_url, expected_url) + self.assertIn("#provided-assets-info", self.asset.user_view_url) diff --git a/apps/users/templates/users/sponsorship_assets_view.html b/apps/users/templates/users/sponsorship_assets_view.html deleted file mode 100644 index 7a8e9410c..000000000 --- a/apps/users/templates/users/sponsorship_assets_view.html +++ /dev/null @@ -1,35 +0,0 @@ -{% extends "users/base.html" %} -{% load widget_tweaks %} -{% load humanize pipeline %} - -{% block head %} - {% stylesheet 'font-awesome' %} -{% endblock %} - -{% block page_title %} - {{ sponsorship }} assets | {{ SITE_INFO.site_name }} -{% endblock %} - -{% block body_attributes %}class="psf signup default-page"{% endblock %} - -{% block main-nav_attributes %}psf-navigation{% endblock %} - -{% block user_content %} -
{{ asset.sponsor_benefit }} benefit provides you with {{ asset.label }}:
- {% if asset.polymorphic_ctype.name == "Provided Text" %} -{{ asset.value|urlize }}
- {% elif asset.polymorphic_ctype.name == "Provided File" %}
- View File
- {% else %}
- {{ asset.value }}
- {% endif %}
- {{ asset.help_text }}
-