dani/django-ram
1
0
Fork 0
mirror of https://github.com/daniviga/django-ram.git synced 2026-02-03 17:40:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix a small regression in the admin introduced with Django 6

Browse Source
This commit is contained in:
Daniele Viganò
2026-01-08 12:21:39 +01:00
parent a16801eb4b
commit ab606859d1
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ram/bookshelf/admin.py
View File

@@ -2,7 +2,12 @@ import html
from django.conf import settings from django.conf import settings
from django.contrib import admin from django.contrib import admin
from django.utils.html import format_html, format_html_join, strip_tags from django.utils.html import (
format_html,
format_html_join,
strip_tags,
mark_safe,
)
from adminsortable2.admin import SortableAdminBase, SortableInlineAdminMixin from adminsortable2.admin import SortableAdminBase, SortableInlineAdminMixin
from ram.admin import publish, unpublish from ram.admin import publish, unpublish
@@ -149,7 +154,7 @@ class BookAdmin(SortableAdminBase, admin.ModelAdmin):
def invoices(self, obj): def invoices(self, obj):
if obj.invoice.exists(): if obj.invoice.exists():
html = format_html_join( html = format_html_join(
"<br>", mark_safe("<br>"),
'<a href="{}" target="_blank">{}</a>', '<a href="{}" target="_blank">{}</a>',
((i.file.url, i) for i in obj.invoice.all()), ((i.file.url, i) for i in obj.invoice.all()),
) )
@@ -317,7 +322,7 @@ class CatalogAdmin(SortableAdminBase, admin.ModelAdmin):
def invoices(self, obj): def invoices(self, obj):
if obj.invoice.exists(): if obj.invoice.exists():
html = format_html_join( html = format_html_join(
"<br>", mark_safe("<br>"),
'<a href="{}" target="_blank">{}</a>', '<a href="{}" target="_blank">{}</a>',
((i.file.url, i) for i in obj.invoice.all()), ((i.file.url, i) for i in obj.invoice.all()),
) )

10
ram/roster/admin.py
View File

@@ -2,8 +2,12 @@ import html
from django.conf import settings from django.conf import settings
from django.contrib import admin from django.contrib import admin
from django.utils.html import format_html, format_html_join, strip_tags from django.utils.html import (
format_html,
format_html_join,
strip_tags,
mark_safe,
)
from adminsortable2.admin import SortableAdminBase, SortableInlineAdminMixin from adminsortable2.admin import SortableAdminBase, SortableInlineAdminMixin
from ram.utils import generate_csv from ram.utils import generate_csv
@@ -229,7 +233,7 @@ class RollingStockAdmin(SortableAdminBase, admin.ModelAdmin):
def invoices(self, obj): def invoices(self, obj):
if obj.invoice.exists(): if obj.invoice.exists():
html = format_html_join( html = format_html_join(
"<br>", mark_safe("<br>"),
'<a href="{}" target="_blank">{}</a>', '<a href="{}" target="_blank">{}</a>',
((i.file.url, i) for i in obj.invoice.all()), ((i.file.url, i) for i in obj.invoice.all()),
) )