mirror of
				https://github.com/paperless-ngx/paperless-ngx.git
				synced 2025-10-30 03:56:23 -05:00 
			
		
		
		
	add fix for messed up html at reminders, thanks to @brookst
This commit is contained in:
		| @@ -8,6 +8,8 @@ try: | ||||
| except ImportError: | ||||
|     from django.urls import reverse | ||||
| from django.templatetags.static import static | ||||
| from django.utils.safestring import mark_safe | ||||
| from django.utils.html import format_html, format_html_join | ||||
|  | ||||
| from .models import Correspondent, Tag, Document, Log | ||||
|  | ||||
| @@ -180,7 +182,7 @@ class DocumentAdmin(CommonAdmin): | ||||
|                     ) | ||||
|                 } | ||||
|             ) | ||||
|         return r | ||||
|         return mark_safe(r) | ||||
|     tags_.allow_tags = True | ||||
|  | ||||
|     def document(self, obj): | ||||
| @@ -201,15 +203,14 @@ class DocumentAdmin(CommonAdmin): | ||||
|     @staticmethod | ||||
|     def _html_tag(kind, inside=None, **kwargs): | ||||
|  | ||||
|         attributes = [] | ||||
|         for lft, rgt in kwargs.items(): | ||||
|             attributes.append('{}="{}"'.format(lft, rgt)) | ||||
|         attributes = format_html_join(' ', '{}="{}"', kwargs.items())  | ||||
|  | ||||
|         if inside is not None: | ||||
|             return "<{kind} {attributes}>{inside}</{kind}>".format( | ||||
|                 kind=kind, attributes=" ".join(attributes), inside=inside) | ||||
|             return format_html("<{kind} {attributes}>{inside}</{kind}>", | ||||
|                 kind=kind, attributes=attributes, inside=inside) | ||||
|  | ||||
|         return "<{} {}/>".format(kind, " ".join(attributes)) | ||||
|  | ||||
|         return format_html("<{} {}/>", kind, attributes) | ||||
|  | ||||
|  | ||||
| class LogAdmin(CommonAdmin): | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 dadosch
					dadosch