diff options
| author | Lex Neva <github.com@lexneva.name> | 2018-05-04 20:00:29 -0400 |
|---|---|---|
| committer | Lex Neva <github.com@lexneva.name> | 2018-05-04 20:00:29 -0400 |
| commit | 2c9077abce462365cfdaac7e426a91537cb2ec2c (patch) | |
| tree | d0c812def5099c376c915f45f568ad05d0cb2c4c | |
| parent | 5b376d80fcc153c3c2ddf835eb3bd5a55ab5a816 (diff) | |
| parent | e1df573298ccc47dc573c3fbec5aaa11afa1449f (diff) | |
Merge branch 'master' into lexelby-single-extension
| -rw-r--r-- | lib/extensions/print_pdf.py | 2 | ||||
| -rw-r--r-- | print/templates/ui.html | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/extensions/print_pdf.py b/lib/extensions/print_pdf.py index 6450ee7c..baeb7eba 100644 --- a/lib/extensions/print_pdf.py +++ b/lib/extensions/print_pdf.py @@ -371,7 +371,7 @@ class Print(InkstitchExtension): svg_overview = overview_svg, color_blocks = stitch_plan.color_blocks, palettes = ThreadCatalog().palette_names(), - selected_palette = palette.name, + selected_palette = palette, ) # We've totally mucked with the SVG. Restore it so that we can save diff --git a/print/templates/ui.html b/print/templates/ui.html index 112a342e..b09dc941 100644 --- a/print/templates/ui.html +++ b/print/templates/ui.html @@ -42,7 +42,7 @@ <option value="" selected>None</option> {% endif %} {% for palette in palettes %} - <option value="{{ palette }}" {{ "selected" if palette == selected_palette else "" }}>{{ palette }}</option> + <option value="{{ palette }}" {{ "selected" if palette == selected_palette.name else "" }}>{{ palette }}</option> {% endfor %} </select> </p> |