Add A6 to list of page sizes

indico · Feb 22, 2019 · abde478 · abde478
1 parent 0c97dd0
commit abde478
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/indico/legacy/pdfinterface/base.py b/indico/legacy/pdfinterface/base.py
@@ -28,7 +28,7 @@
 from reportlab import platypus
 from reportlab.lib.enums import TA_CENTER
 from reportlab.lib.fonts import addMapping
-from reportlab.lib.pagesizes import A0, A1, A2, A3, A4, A5, LETTER, landscape
+from reportlab.lib.pagesizes import A0, A1, A2, A3, A4, A5, A6, LETTER, landscape
 from reportlab.lib.styles import ParagraphStyle
 from reportlab.lib.units import cm, inch
 from reportlab.pdfbase import pdfmetrics
@@ -52,13 +52,16 @@
 
 class PDFSizes:
     def __init__(self):
-        self.PDFpagesizes = {'Letter': LETTER,
-                             'A0': A3,
-                             'A1': A3,
-                             'A2': A3,
-                             'A3': A3,
-                             'A4': A4,
-                             'A5': A5}
+        self.PDFpagesizes = {
+            'Letter': LETTER,
+            'A0': A3,
+            'A1': A3,
+            'A2': A3,
+            'A3': A3,
+            'A4': A4,
+            'A5': A5,
+            'A6': A6
+        }
 
 
 def escape(text):

diff --git a/indico/modules/designer/__init__.py b/indico/modules/designer/__init__.py
@@ -38,14 +38,15 @@ class PageOrientation(RichIntEnum):
 
 
 class PageSize(RichIntEnum):
-    __titles__ = [None, 'A0', 'A1', 'A2', 'A3', 'A4', 'A5', 'Letter']
+    __titles__ = [None, 'A0', 'A1', 'A2', 'A3', 'A4', 'A5', 'Letter', 'A6']
     A0 = 1
     A1 = 2
     A2 = 3
     A3 = 4
     A4 = 5
     A5 = 6
     letter = 7
+    A6 = 8
 
 
 class PageLayout(RichIntEnum):

diff --git a/indico/modules/events/management/forms.py b/indico/modules/events/management/forms.py
@@ -284,7 +284,7 @@ class PosterPrintingForm(IndicoForm):
     template = SelectField(_('Template'))
     margin_horizontal = FloatField(_('Horizontal margins'), [InputRequired()], default=0)
     margin_vertical = FloatField(_('Vertical margins'), [InputRequired()], default=0)
-    page_size = IndicoEnumSelectField(_('Page size'), enum=PageSize, default=PageSize.A4)
+    page_size = IndicoEnumSelectField(_('Page size'), enum=PageSize, default=PageSize.A4, sorted=True)
 
     def __init__(self, event, **kwargs):
         all_templates = set(event.designer_templates) | get_inherited_templates(event)

diff --git a/indico/modules/events/registration/forms.py b/indico/modules/events/registration/forms.py
@@ -373,7 +373,7 @@ class BadgeSettingsForm(IndicoForm):
                                description=_("Save these values in the event settings"))
     dashed_border = BooleanField(_("Dashed border around each badge"), widget=SwitchWidget(),
                                  description=_("Display a dashed border around each badge"))
-    page_size = IndicoEnumSelectField(_('Page size'), enum=PageSize)
+    page_size = IndicoEnumSelectField(_('Page size'), enum=PageSize, sorted=True)
     page_orientation = IndicoEnumSelectField(_('Page orientation'), enum=PageOrientation)
     page_layout = IndicoEnumSelectField(_('Page layout'), enum=PageLayout,
                                         description=_('The single sided (foldable) option is only available if the '