X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/f1ec080b394326e35074c57e682789176cd3f244..28d8ea078f34a1df16a88a593570cea6e53dd404:/apps/catalogue/forms.py?ds=inline diff --git a/apps/catalogue/forms.py b/apps/catalogue/forms.py index e2f52b0f8..6ed6d62c2 100644 --- a/apps/catalogue/forms.py +++ b/apps/catalogue/forms.py @@ -14,8 +14,8 @@ from catalogue import utils class BookImportForm(forms.Form): book_xml_file = forms.FileField() - def save(self, commit=True): - return Book.from_xml_file(self.cleaned_data['book_xml_file'], overwrite=True) + def save(self, commit=True, **kwargs): + return Book.from_xml_file(self.cleaned_data['book_xml_file'], overwrite=True, **kwargs) class SearchForm(forms.Form): @@ -26,7 +26,7 @@ class SearchForm(forms.Form): tags = kwargs.pop('tags', []) super(SearchForm, self).__init__(*args, **kwargs) self.fields['q'].widget.attrs['title'] = _('title, author, theme/topic, epoch, kind, genre') - self.fields['q'].widget.attrs['style'] = 'float: left; width: 200px; border: medium none; height: 15px; margin-top: 2px;' + #self.fields['q'].widget.attrs['style'] = '' self.fields['tags'].initial = '/'.join(tag.slug for tag in Tag.get_tag_list(tags)) @@ -59,7 +59,7 @@ class NewSetForm(forms.Form): def save(self, user, commit=True): name = self.cleaned_data['name'] - new_set = Tag(name=name, slug=utils.get_random_hash(name), sort_key=slughifi(name), + new_set = Tag(name=name, slug=utils.get_random_hash(name), sort_key=name.lower(), category='set', user=user) new_set.save() @@ -73,6 +73,7 @@ FORMATS = ( ('odt', 'ODT'), ('txt', 'TXT'), ('epub', 'EPUB'), + ('daisy', 'DAISY'), )