Merge pull request #6053 from roed314/fix_pic

Better fix for svg image
LMFDB · May 18, 2024 · 7722d48 · 7722d48
2 parents 04b2ebf + e9da226
commit 7722d48
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/lmfdb/groups/abstract/main.py b/lmfdb/groups/abstract/main.py
@@ -1627,7 +1627,7 @@ def picture_page():
         learnmore=learnmore_list_remove("Picture")
     )
 
-@abstract_page.route("picture/<label>")
+@abstract_page.route("picture/<label>.svg")
 def picture(label):
     if label_is_valid(label):
         label = clean_input(label)
@@ -1642,11 +1642,10 @@ def picture(label):
             flash_error("Error generating image for %s.", label)
             return redirect(url_for(".index"))
         else:
-            img = f'<!DOCTYPE html>\n<html lang="en">\n<body>\n{img}</body></html>'
             svg_io = BytesIO()
             svg_io.write(img.encode("utf-8"))
             svg_io.seek(0)
-            return send_file(svg_io, mimetype='text/html') #, mimetype='image/svg+xml')
+            return send_file(svg_io, mimetype='image/svg+xml')
     else:
         flash_error("The label %s is invalid.", label)
         return redirect(url_for(".index"))

diff --git a/lmfdb/groups/abstract/web_groups.py b/lmfdb/groups/abstract/web_groups.py
@@ -2505,7 +2505,7 @@ def image(self):
         else:
             R = 1
             circles = ""
-        return f'<img><svg xmlns="https://www.w3.org/2000/svg" viewBox="-{R} -{R} {2*R} {2*R}" width="200" height="150">\n{circles}</svg></img>'
+        return f'<svg xmlns="http://www.w3.org/2000/svg" viewBox="-{R} -{R} {2*R} {2*R}" width="200" height="150">\n{circles}</svg>'
 
     # The following attributes are used in create_boolean_string
     @property