[Maposmatic-dev] [PATCH 5/8] Support None/None initial paper size for the 'Best fit' case

[Thomas Petazzoni]

Signed-off-by: Thomas Petazzoni <address@hidden>
---
 www/maposmatic/forms.py |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/www/maposmatic/forms.py b/www/maposmatic/forms.py
index c620ebe..e249699 100644
--- a/www/maposmatic/forms.py
+++ b/www/maposmatic/forms.py
@@ -93,10 +93,16 @@ class MapRenderingJobForm(forms.ModelForm):
                 for s in stylesheets]
         self.fields['stylesheet'].initial = stylesheets[0].name
 
-        self.fields['papersize'].choices = [
-                (p[0], mark_safe("%s <em class=\"papersize\">"
+        def _build_papersize_description(p):
+            if p[1] is None or p[2] is None:
+                return mark_safe("%s <em class=\"papersize\"></em>" % p[0])
+            else:
+                return mark_safe("%s <em class=\"papersize\">"
                                  "(%.1f &times; %.1f cm²)</em>"
-                                  % (p[0], p[1] / 10., p[2] / 10.)))
+                                 % (p[0], p[1] / 10., p[2] / 10.))
+
+        self.fields['papersize'].choices = [
+                (p[0], _build_papersize_description(p))
                 for p in renderers.Renderer.PAPER_SIZES]
 
     def clean(self):
-- 
1.7.0.4