Added MP3 and OGG to book short_html view.

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

diff --git a/apps/catalogue/forms.py b/apps/catalogue/forms.py
index 688e5ed..48faeb1 100644 (file)
--- a/apps/catalogue/forms.py
+++ b/apps/catalogue/forms.py
@@ -2,11 +2,18 @@
 from django import forms
 from slughifi import slughifi
 
 from django import forms
 from slughifi import slughifi
 

-from catalogue.models import Tag
+from catalogue.models import Tag, Book

 from catalogue.fields import JQueryAutoCompleteField
 from catalogue import utils
 
 
 from catalogue.fields import JQueryAutoCompleteField
 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)
+
+

 class SearchForm(forms.Form):
     q = JQueryAutoCompleteField('/katalog/tags/', {'minChars': 2, 'selectFirst': True, 'cacheLength': 50})
     tags = forms.CharField(widget=forms.HiddenInput, required=False)
 class SearchForm(forms.Form):
     q = JQueryAutoCompleteField('/katalog/tags/', {'minChars': 2, 'selectFirst': True, 'cacheLength': 50})
     tags = forms.CharField(widget=forms.HiddenInput, required=False)


@@ -14,7 +21,7 @@ class SearchForm(forms.Form):
     def __init__(self, *args, **kwargs):
         tags = kwargs.pop('tags', [])
         super(SearchForm, self).__init__(*args, **kwargs)
     def __init__(self, *args, **kwargs):
         tags = kwargs.pop('tags', [])
         super(SearchForm, self).__init__(*args, **kwargs)

-        self.fields['q'].widget.attrs['title'] = u'tytuł, autor, motyw, epoka, rodzaj, gatunek literacki'
+        self.fields['q'].widget.attrs['title'] = u'tytuł, autor, motyw/temat, epoka, rodzaj, gatunek'

         self.fields['tags'].initial = '/'.join(tag.slug for tag in Tag.get_tag_list(tags))
 
 
         self.fields['tags'].initial = '/'.join(tag.slug for tag in Tag.get_tag_list(tags))
 
 


@@ -32,7 +39,7 @@ class ObjectSetsForm(forms.Form):
         self.fields['set_ids'] = forms.MultipleChoiceField(
             label=u'Półki',
             required=False,
         self.fields['set_ids'] = forms.MultipleChoiceField(
             label=u'Półki',
             required=False,

-            choices=[(tag.id, tag.name) for tag in Tag.objects.filter(category='set', user=user)],
+            choices=[(tag.id, "%s (%s)" % (tag.name, tag.book_count)) for tag in Tag.objects.filter(category='set', user=user)],

             initial=[tag.id for tag in obj.tags.filter(category='set', user=user)],
             widget=forms.CheckboxSelectMultiple
         )
             initial=[tag.id for tag in obj.tags.filter(category='set', user=user)],
             widget=forms.CheckboxSelectMultiple
         )