#1060: sorted and unique editors' names

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

diff --git a/apps/catalogue/forms.py b/apps/catalogue/forms.py
index 9359837..6ed6d62 100644 (file)
--- 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()
 
 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):
 
 
 class SearchForm(forms.Form):


@@ -59,7 +59,7 @@ class NewSetForm(forms.Form):
 
     def save(self, user, commit=True):
         name = self.cleaned_data['name']
 
     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()
             category='set', user=user)
 
         new_set.save()


@@ -73,6 +73,7 @@ FORMATS = (
     ('odt', 'ODT'),
     ('txt', 'TXT'),
     ('epub', 'EPUB'),
     ('odt', 'ODT'),
     ('txt', 'TXT'),
     ('epub', 'EPUB'),

+    ('daisy', 'DAISY'),

 )
 
 
 )