Allow print to !pdf
This commit is contained in:
parent
f8cf1996a2
commit
a5eb814c18
1 changed files with 2 additions and 3 deletions
5
vendor/registrasion/registrasion/views.py
vendored
5
vendor/registrasion/registrasion/views.py
vendored
|
@ -1146,13 +1146,12 @@ def badge(request, user_id, format="png"):
|
||||||
user_id = int(user_id)
|
user_id = int(user_id)
|
||||||
user = User.objects.get(pk=user_id)
|
user = User.objects.get(pk=user_id)
|
||||||
|
|
||||||
return render_badge(user, format='pdf')
|
return render_badge(user, format=format)
|
||||||
|
|
||||||
def _convert_img(img, outformat="png", dpi=600, width=None):
|
def _convert_img(img, outformat="png", dpi=600, width=None):
|
||||||
if hasattr(img, "encode"): #a string, or a SafeText
|
if hasattr(img, "encode"): #a string, or a SafeText
|
||||||
img=img.encode()
|
img=img.encode()
|
||||||
|
|
||||||
|
|
||||||
width = width or dpi*5.83 #5.83 inches in A5 portrait
|
width = width or dpi*5.83 #5.83 inches in A5 portrait
|
||||||
conversion_cmdline = [
|
conversion_cmdline = [
|
||||||
"convert",
|
"convert",
|
||||||
|
@ -1164,7 +1163,6 @@ def _convert_img(img, outformat="png", dpi=600, width=None):
|
||||||
conversion_cmdline.extend(["-background","white",
|
conversion_cmdline.extend(["-background","white",
|
||||||
"-flatten"])
|
"-flatten"])
|
||||||
conversion_cmdline.extend(["-", "{}:-".format(outformat)])
|
conversion_cmdline.extend(["-", "{}:-".format(outformat)])
|
||||||
|
|
||||||
if outformat=="pdf":
|
if outformat=="pdf":
|
||||||
# Inkscape results in nicer pdf render, embedding fonts etc where possible
|
# Inkscape results in nicer pdf render, embedding fonts etc where possible
|
||||||
conversion_cmdline = [
|
conversion_cmdline = [
|
||||||
|
@ -1179,6 +1177,7 @@ def _convert_img(img, outformat="png", dpi=600, width=None):
|
||||||
def render_badge(user, format="png", overlay=False, request=None):
|
def render_badge(user, format="png", overlay=False, request=None):
|
||||||
if request and waffle.flag_is_active(request, "force_badge_overlay"):
|
if request and waffle.flag_is_active(request, "force_badge_overlay"):
|
||||||
overlay=True
|
overlay=True
|
||||||
|
|
||||||
rendered = render_badge_svg(user, overlay=overlay)
|
rendered = render_badge_svg(user, overlay=overlay)
|
||||||
if format == "png":
|
if format == "png":
|
||||||
rendered = _convert_img(rendered, outformat="png")
|
rendered = _convert_img(rendered, outformat="png")
|
||||||
|
|
Loading…
Reference in a new issue