X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/ae60b2a3949e96357477cc04f90fd0873cee8a92..070975c3e28093c54fa890962a756e89b5f4d155:/src/catalogue/forms.py?ds=inline diff --git a/src/catalogue/forms.py b/src/catalogue/forms.py index 82a5d1f1a..c1348a1e4 100644 --- a/src/catalogue/forms.py +++ b/src/catalogue/forms.py @@ -15,6 +15,7 @@ from catalogue.tasks import build_custom_pdf class BookImportForm(forms.Form): book_xml_file = forms.FileField(required=False) book_xml = forms.CharField(required=False) + gallery_url = forms.CharField(required=False) def clean(self): from django.core.files.base import ContentFile @@ -22,13 +23,14 @@ class BookImportForm(forms.Form): if not self.cleaned_data['book_xml_file']: if self.cleaned_data['book_xml']: self.cleaned_data['book_xml_file'] = \ - ContentFile(self.cleaned_data['book_xml'].encode('utf-8')) + ContentFile(self.cleaned_data['book_xml'].encode('utf-8')) else: raise forms.ValidationError(_("Please supply an XML.")) return super(BookImportForm, self).clean() - def save(self, commit=True, **kwargs): - return Book.from_xml_file(self.cleaned_data['book_xml_file'], overwrite=True, **kwargs) + 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'], **kwargs) FORMATS = [(f, f.upper()) for f in Book.ebook_formats] @@ -45,7 +47,7 @@ CUSTOMIZATION_FLAGS = ( ('nofootnotes', _("Don't show footnotes")), ('nothemes', _("Don't disply themes")), ('nowlfont', _("Don't use our custom font")), - ('no-cover', _("Without cover")), + ('nocover', _("Without cover")), ) CUSTOMIZATION_OPTIONS = ( ('leading', _("Leading"), (