X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/e224f0bea768179cf44886dfbabbd296767d79dd..14b70eccc2fec2c214671ca2aeb169baf40dacf2:/catalogue/forms.py?ds=inline

diff --git a/catalogue/forms.py b/catalogue/forms.py
index 7472eb420..279ec7193 100644
--- a/catalogue/forms.py
+++ b/catalogue/forms.py
@@ -1,18 +1,20 @@
 # -*- coding: utf-8 -*-
 from django import forms
+from slughifi import slughifi
 
 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})
-    tags = forms.CharField(widget=forms.HiddenInput)
+    tags = forms.CharField(widget=forms.HiddenInput, required=False)
     
     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'
+        self.fields['tags'].initial = '/'.join(tag.slug for tag in Tag.get_tag_list(tags))
 
 
 class UserSetsForm(forms.Form):
@@ -23,14 +25,14 @@ class UserSetsForm(forms.Form):
         )
 
 
-class BookSetsForm(forms.Form):
-    def __init__(self, book, user, *args, **kwargs):        
-        super(BookSetsForm, self).__init__(*args, **kwargs)
+class ObjectSetsForm(forms.Form):
+    def __init__(self, obj, user, *args, **kwargs):        
+        super(ObjectSetsForm, self).__init__(*args, **kwargs)
         self.fields['set_ids'] = forms.MultipleChoiceField(
-            label=u'Zestawy',
+            label=u'Półki',
             required=False,
             choices=[(tag.id, tag.name) for tag in Tag.objects.filter(category='set', user=user)],
-            initial=[tag.id for tag in book.tags.filter(category='set', user=user)],
+            initial=[tag.id for tag in obj.tags.filter(category='set', user=user)],
             widget=forms.CheckboxSelectMultiple
         )