X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/916aa587c9cc241044c57493f5f4aea5d0b7a2de..d558ef2cdb31a67f24ffff34c30ccda3ebbee6c6:/apps/catalogue/forms.py?ds=sidebyside

diff --git a/apps/catalogue/forms.py b/apps/catalogue/forms.py
index 935983734..fd751965a 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):
@@ -27,7 +27,7 @@ class SearchForm(forms.Form):
         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'] = ''
-        self.fields['tags'].initial = '/'.join(tag.slug for tag in Tag.get_tag_list(tags))
+        self.fields['tags'].initial = '/'.join(tag.url_chunk for tag in Tag.get_tag_list(tags))
 
 
 class UserSetsForm(forms.Form):
@@ -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'),
 )