From: Marcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Date: Thu, 12 Apr 2012 09:14:39 +0000 (+0200)
Subject: Merge branch 'master' of github.com:fnp/wolnelektury
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/07a437ef67ffcad01b83255999d2d7744f994d7f?hp=b89eaee8db7e1d44278a65cdf9a42d035ecab50a

Merge branch 'master' of github.com:fnp/wolnelektury
---

diff --git a/apps/catalogue/forms.py b/apps/catalogue/forms.py
index c4ddbcbf5..5fb113c24 100644
--- a/apps/catalogue/forms.py
+++ b/apps/catalogue/forms.py
@@ -49,12 +49,12 @@ CUSTOMIZATION_FLAGS = (
     )
 CUSTOMIZATION_OPTIONS = (
     ('leading', _("Leading"), (
-        ('defaultleading', _('Normal leading')),
+        ('', _('Normal leading')),
         ('onehalfleading', _('One and a half leading')),
         ('doubleleading', _('Double leading')),
         )),
     ('fontsize', _("Font size"), (
-        ('11pt', _('Default')),
+        ('', _('Default')),
         ('13pt', _('Big'))
         )),
 #    ('pagesize', _("Paper size"), (
@@ -71,7 +71,7 @@ class CustomPDFForm(forms.Form):
         for name, label in CUSTOMIZATION_FLAGS:
             self.fields[name] = forms.BooleanField(required=False, label=label)
         for name, label, choices in CUSTOMIZATION_OPTIONS:
-            self.fields[name] = forms.ChoiceField(choices, label=label)
+            self.fields[name] = forms.ChoiceField(choices, required=False, label=label)
 
     def clean(self):
         self.cleaned_data['cust'] = self.customizations
@@ -88,11 +88,16 @@ class CustomPDFForm(forms.Form):
             if self.cleaned_data.get(name):
                 c.append(name)
         for name, label, choices in CUSTOMIZATION_OPTIONS:
-            c.append(self.cleaned_data[name])
+            option = self.cleaned_data.get(name)
+            if option:
+                c.append(option)
         c.sort()
         return c
 
     def save(self, *args, **kwargs):
+        if not self.cleaned_data['cust'] and self.book.pdf_file:
+            # Don't build with default options, just redirect to the standard file.
+            return {"redirect": self.book.pdf_file.url}
         url = WaitedFile.order(self.cleaned_data['path'],
             lambda p: build_custom_pdf.delay(self.book.id,
                 self.cleaned_data['cust'], p),
diff --git a/requirements.txt b/requirements.txt
index fb64d9501..0b2875642 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -32,7 +32,7 @@ lxml>=2.2.2
 # MySQL-python>=1.2,<2.0
 
 # celery tasks
-django-celery
+django-celery>=2.5.1
 django-kombu
 
 # spell checking