From 968397228fe03968bb855856532569586c8a8a1c Mon Sep 17 00:00:00 2001 From: sai-ganesh-03 Date: Thu, 31 Oct 2024 19:10:00 +0530 Subject: Fixed #35867, Refs #2411 -- Allowed links in admindocs view details summary. --- django/contrib/admindocs/templates/admin_doc/view_detail.html | 2 +- django/contrib/admindocs/utils.py | 4 ++++ django/contrib/admindocs/views.py | 6 +++--- 3 files changed, 8 insertions(+), 4 deletions(-) (limited to 'django') diff --git a/django/contrib/admindocs/templates/admin_doc/view_detail.html b/django/contrib/admindocs/templates/admin_doc/view_detail.html index d1aa3ab98f..5a5b47247e 100644 --- a/django/contrib/admindocs/templates/admin_doc/view_detail.html +++ b/django/contrib/admindocs/templates/admin_doc/view_detail.html @@ -15,7 +15,7 @@

{{ name }}

-

{{ summary|striptags }}

+

{{ summary }}

{{ body }} diff --git a/django/contrib/admindocs/utils.py b/django/contrib/admindocs/utils.py index 3708a32813..3a7ca4e781 100644 --- a/django/contrib/admindocs/utils.py +++ b/django/contrib/admindocs/utils.py @@ -242,3 +242,7 @@ def remove_non_capturing_groups(pattern): final_pattern += pattern[prev_end:start] prev_end = end return final_pattern + pattern[prev_end:] + + +def strip_p_tags(value): + return mark_safe(value.replace("

", "").replace("

", "")) diff --git a/django/contrib/admindocs/views.py b/django/contrib/admindocs/views.py index 38a2bb9286..3fdb34e0d1 100644 --- a/django/contrib/admindocs/views.py +++ b/django/contrib/admindocs/views.py @@ -30,7 +30,7 @@ from django.utils.inspect import ( from django.utils.translation import gettext as _ from django.views.generic import TemplateView -from .utils import get_view_name +from .utils import get_view_name, strip_p_tags # Exclude methods starting with these strings from documentation MODEL_METHODS_EXCLUDE = ("_", "add_", "delete", "save", "set_") @@ -195,7 +195,7 @@ class ViewDetailView(BaseAdminDocsView): **{ **kwargs, "name": view, - "summary": title, + "summary": strip_p_tags(title), "body": body, "meta": metadata, } @@ -384,7 +384,7 @@ class ModelDetailView(BaseAdminDocsView): **{ **kwargs, "name": opts.label, - "summary": title, + "summary": strip_p_tags(title), "description": body, "fields": fields, "methods": methods, -- cgit v1.3