Changed "has description" to "description" in Book.has_pdf_file method description.

[wolnelektury.git] / catalogue / forms.py

diff --git a/catalogue/forms.py b/catalogue/forms.py
index 7472eb4..1c6ca83 100644 (file)
--- a/catalogue/forms.py
+++ b/catalogue/forms.py
@@ -1,18 +1,20 @@
 # -*- coding: utf-8 -*-
 from django import forms
 # -*- coding: utf-8 -*-
 from django import forms

+from slughifi import slughifi

 
 from catalogue.models import Tag
 from catalogue.fields import JQueryAutoCompleteField
 
 from catalogue.models import Tag
 from catalogue.fields import JQueryAutoCompleteField

-from catalogue.lib.slughifi import slughifi

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

-    tags = forms.CharField(widget=forms.HiddenInput)
+    tags = forms.CharField(widget=forms.HiddenInput, required=False)

     
     def __init__(self, *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ł utworu, motyw lub kategoria'
         super(SearchForm, self).__init__(*args, **kwargs)
         self.fields['q'].widget.attrs['title'] = u'tytuł utworu, motyw lub kategoria'

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

 
 
 class UserSetsForm(forms.Form):
 
 
 class UserSetsForm(forms.Form):