Introducing new layout generic forms.

[wolnelektury.git] / src / catalogue / forms.py

diff --git a/src/catalogue/forms.py b/src/catalogue/forms.py
index a28eaff..f124f31 100644 (file)
--- a/src/catalogue/forms.py
+++ b/src/catalogue/forms.py
@@ -1,9 +1,8 @@
-# -*- coding: utf-8 -*-

 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django import forms
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django import forms

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 
 from catalogue.models import Book
 from waiter.models import WaitedFile
 
 from catalogue.models import Book
 from waiter.models import WaitedFile


@@ -17,6 +16,7 @@ class BookImportForm(forms.Form):
     book_xml = forms.CharField(required=False)
     gallery_url = forms.CharField(required=False)
     days = forms.IntegerField(required=False)
     book_xml = forms.CharField(required=False)
     gallery_url = forms.CharField(required=False)
     days = forms.IntegerField(required=False)

+    hidden = forms.BooleanField(required=False)

 
     def clean(self):
         from django.core.files.base import ContentFile
 
     def clean(self):
         from django.core.files.base import ContentFile


@@ -32,7 +32,9 @@ class BookImportForm(forms.Form):
     def save(self, **kwargs):
         return Book.from_xml_file(self.cleaned_data['book_xml_file'], overwrite=True,
                                   remote_gallery_url=self.cleaned_data['gallery_url'],
     def save(self, **kwargs):
         return Book.from_xml_file(self.cleaned_data['book_xml_file'], overwrite=True,
                                   remote_gallery_url=self.cleaned_data['gallery_url'],

-                                  days=self.cleaned_data['days'], **kwargs)
+                                  days=self.cleaned_data['days'],
+                                  findable=not self.cleaned_data['hidden'],
+                                  **kwargs)

 
 
 FORMATS = [(f, f.upper()) for f in Book.ebook_formats]
 
 
 FORMATS = [(f, f.upper()) for f in Book.ebook_formats]


@@ -50,6 +52,7 @@ CUSTOMIZATION_FLAGS = (
     ('nothemes', _("Don't disply themes")),
     ('nowlfont', _("Don't use our custom font")),
     ('nocover', _("Without cover")),
     ('nothemes', _("Don't disply themes")),
     ('nowlfont', _("Don't use our custom font")),
     ('nocover', _("Without cover")),

+    ('notoc', _("Without table of contents")),

     )
 CUSTOMIZATION_OPTIONS = (
     ('leading', _("Leading"), (
     )
 CUSTOMIZATION_OPTIONS = (
     ('leading', _("Leading"), (


@@ -76,7 +79,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:
         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, required=False, label=label)
+            self.fields[name] = forms.ChoiceField(choices=choices, required=False, label=label)

 
     def clean(self):
         self.cleaned_data['cust'] = self.customizations
 
     def clean(self):
         self.cleaned_data['cust'] = self.customizations