Port to Django 5.2

This commit is contained in:
2025-10-05 18:05:08 +01:00
parent fa60c4421f
commit e8355dba90
31 changed files with 496 additions and 437 deletions

View File

@@ -1,4 +1,4 @@
{% extends request.is_ajax|yesno:'base_ajax.html,base_assets.html' %}
{% extends is_ajax|yesno:'base_ajax.html,base_assets.html' %}
{% load widget_tweaks %}
{% block content %}
@@ -79,7 +79,7 @@
</div>
</div>
</div>
{% if not request.is_ajax %}
{% if not is_ajax %}
<div class="form-group form-row pull-right">
<button class="btn btn-success" type="submit" form="asset_audit_form" id="id_mark_audited">Mark Audited</button>
</div>

View File

@@ -16,7 +16,7 @@ from django.views.decorators.csrf import csrf_exempt
from django.shortcuts import get_object_or_404
from django.template.loader import get_template
from PyPDF2 import PdfFileMerger, PdfFileReader
from PyPDF2 import PdfMerger, PdfReader
from PIL import Image, ImageDraw, ImageFont, ImageOps
from barcode import Code39
from barcode.writer import ImageWriter
@@ -417,11 +417,11 @@ class GenerateLabels(generic.View):
# 'images3': images[3::4],
'filename': name
}
merger = PdfFileMerger()
merger = PdfMerger()
rml = template.render(context)
buffer = rml2pdf.parseString(rml)
merger.append(PdfFileReader(buffer))
merger.append(PdfReader(buffer))
buffer.close()
merged = BytesIO()