Skip to content

Address Copilot review of format_html() functions #2953

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JacobCoffee merged 2 commits into from
Apr 6, 2026
Merged

Address Copilot review of format_html() functions #2953

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c19a25
Address Copilot review of format_html() functions
sethmlarson Mar 5, 2026
ea29a4a
Merge branch 'main' into xss-fixes
sethmlarson Apr 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions apps/companies/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,7 @@ def test_render_email(self):
render_email("firstname.lastname@domain.com"),
"firstname<span>.</span>lastname<span>@</span>domain<span>.</span>com",
)
self.assertEqual(
render_email('"escape.>me"@domain.com'),
"&quot;escape<span>.</span>&gt;me&quot;<span>@</span>domain<span>.</span>com",
)
8 changes: 4 additions & 4 deletions apps/sponsors/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -807,7 +807,7 @@ def get_custom_benefits_added_by_user(self, obj):
if not benefits:
return "---"

return format_html_join("", "<p>{}</p>", benefits)
return format_html_join("", "<p>{}</p>", [(benefit,) for benefit in benefits])

@admin.display(description="Removed by User")
def get_custom_benefits_removed_by_user(self, obj):
Expand All @@ -816,7 +816,7 @@ def get_custom_benefits_removed_by_user(self, obj):
if not benefits:
return "---"

return format_html_join("", "<p>{}</p>", benefits)
return format_html_join("", "<p>{}</p>", [(benefit,) for benefit in benefits])

def rollback_to_editing_view(self, request, pk):
"""Delegate to the rollback_to_editing admin view."""
Expand Down Expand Up @@ -925,7 +925,7 @@ def other_years(self, obj):

html += format_html(
dedent("""
<li><b>{year}</b>:"
<li><b>{year}</b>:
<ul>
<li><a target='_blank' href='{year_packages_url}'>List packages</a>
<li><a target='_blank' href='{year_benefits_url}'>List benefits</a>
Expand Down Expand Up @@ -1277,7 +1277,7 @@ def get_value(self, obj):
"""Return the asset value, linking to the file URL if applicable."""
html = obj.value
if obj.value and getattr(obj.value, "url", None):
html = format_html("<a href='{}' target='_blank'>{}</a>", (obj.value.url, obj.value))
html = format_html("<a href='{}' target='_blank'>{}</a>", obj.value.url, obj.value)
return html

@admin.display(description="Associated with")
Expand Down