From b33a18d569a694daf3b8e8b466a796b53adbd200 Mon Sep 17 00:00:00 2001 From: Pujan Thapa Date: Sat, 21 Feb 2026 11:55:51 +0100 Subject: [PATCH] Deprecate ProvidedSponsorshipAssetsView Fixes #2611 --- apps/sponsors/models/benefits.py | 4 +-- .../users/sponsorship_assets_view.html | 35 ------------------- .../templates/users/sponsorship_detail.html | 2 -- apps/users/urls.py | 6 +--- apps/users/views.py | 21 ----------- 5 files changed, 3 insertions(+), 65 deletions(-) delete mode 100644 apps/users/templates/users/sponsorship_assets_view.html diff --git a/apps/sponsors/models/benefits.py b/apps/sponsors/models/benefits.py index 02d6a1718..ba13145fb 100644 --- a/apps/sponsors/models/benefits.py +++ b/apps/sponsors/models/benefits.py @@ -314,8 +314,8 @@ 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}" + 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/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 %} -
-

View assets for {{ sponsorship.sponsor }} sponsorship

- - {% for asset in provided_assets %} -

{{ 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 }} -

- {% endfor %} - -
-{% endblock %} diff --git a/apps/users/templates/users/sponsorship_detail.html b/apps/users/templates/users/sponsorship_detail.html index 59745bcc0..82822b8a1 100644 --- a/apps/users/templates/users/sponsorship_detail.html +++ b/apps/users/templates/users/sponsorship_detail.html @@ -71,8 +71,6 @@

Provided Assets



{% endfor %} - View all - assets {% endif %} diff --git a/apps/users/urls.py b/apps/users/urls.py index 110090ff4..0c360c6fd 100644 --- a/apps/users/urls.py +++ b/apps/users/urls.py @@ -34,11 +34,7 @@ views.UpdateSponsorshipAssetsView.as_view(), name="update_sponsorship_assets", ), - path( - "sponsorships//provided-assets/", - views.ProvidedSponsorshipAssetsView.as_view(), - name="view_provided_sponsorship_assets", - ), + path( "sponsorships//", views.SponsorshipDetailView.as_view(), diff --git a/apps/users/views.py b/apps/users/views.py index 9a3264d2e..d11735f6e 100644 --- a/apps/users/views.py +++ b/apps/users/views.py @@ -370,24 +370,3 @@ def form_valid(self, form): return redirect(self.get_success_url()) -@method_decorator(login_required(login_url=settings.LOGIN_URL), name="dispatch") -class ProvidedSponsorshipAssetsView(DetailView): - """TODO: Deprecate this view now that everything lives in the SponsorshipDetailView.""" - - object_name = "sponsorship" - template_name = "users/sponsorship_assets_view.html" - - def get_queryset(self): - """Return all sponsorships for superusers, user-visible ones otherwise.""" - if self.request.user.is_superuser: - return Sponsorship.objects.select_related("sponsor").all() - return self.request.user.sponsorships.select_related("sponsor") - - def get_context_data(self, **kwargs): - """Add provided assets with values to the context.""" - context = super().get_context_data(**kwargs) - provided_assets = BenefitFeature.objects.provided_assets().from_sponsorship(context["sponsorship"]) - provided = [asset for asset in provided_assets if bool(asset.value)] - context["provided_assets"] = provided - context["provided_asset_id"] = self.request.GET.get("provided_asset", None) - return context