diff --git a/formity/admin.py b/formity/admin.py index 4645d39..abb624e 100644 --- a/formity/admin.py +++ b/formity/admin.py @@ -464,7 +464,12 @@ class FaceshieldRequestAdmin(ModelView): @flask_admin.actions.action('shipping_print', 'Kurjerzy / Print shipping labels') def action_shipping_print(self, ids): models = self.get_query().filter(FaceshieldRequest.id.in_(ids)).all() - return render_pdf(HTML(string=self.render('shipping_label.html', models=models))) + return render_pdf(HTML(string=self.render('shipping_label.html', models=models, interleaved=False))) + + @flask_admin.actions.action('shipping_print_interleaved', 'Kurjerzy / Print shipping labels (interleaved)') + def action_shipping_print_interleaved(self, ids): + models = self.get_query().filter(FaceshieldRequest.id.in_(ids)).all() + return render_pdf(HTML(string=self.render('shipping_label.html', models=models, interleaved=True))) @flask_admin.actions.action('shipping_refresh', 'Shipping / Refresh tracking info') def action_shipping_refresh(self, ids): diff --git a/templates/label.html b/templates/label.html index 33f886e..b2eab2e 100644 --- a/templates/label.html +++ b/templates/label.html @@ -68,6 +68,7 @@ html, body {
{% block content %} {% for model in models %} + {% block model_labels scoped %} {% for label_id in range(model.label_count) %}