X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/c82303f184e8d139817ca963c81a63e4c442f9b9..db833ba4517084f61a64907c6d15606e7c881edd:/apps/catalogue/forms.py

diff --git a/apps/catalogue/forms.py b/apps/catalogue/forms.py
index 72aa08533..63a552675 100644
--- a/apps/catalogue/forms.py
+++ b/apps/catalogue/forms.py
@@ -4,6 +4,7 @@ from slughifi import slughifi
 
 from catalogue.models import Tag
 from catalogue.fields import JQueryAutoCompleteField
+from catalogue import utils
 
 
 class SearchForm(forms.Form):
@@ -13,7 +14,7 @@ class SearchForm(forms.Form):
     def __init__(self, *args, **kwargs):
         tags = kwargs.pop('tags', [])
         super(SearchForm, self).__init__(*args, **kwargs)
-        self.fields['q'].widget.attrs['title'] = u'tytuł utworu, kategoria lub motyw 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))
 
 
@@ -31,7 +32,7 @@ class ObjectSetsForm(forms.Form):
         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
         )
@@ -42,11 +43,11 @@ class NewSetForm(forms.Form):
     
     def __init__(self, *args, **kwargs):
         super(NewSetForm, self).__init__(*args, **kwargs)
-        self.fields['name'].widget.attrs['title'] = u'nazwa półki'
+        self.fields['name'].widget.attrs['title'] = u'nazwa nowej półki'
         
     def save(self, user, commit=True):
         name = self.cleaned_data['name']
-        new_set = Tag(name=name, slug=slughifi(name), sort_key=slughifi(name),
+        new_set = Tag(name=name, slug=utils.get_random_hash(name), sort_key=slughifi(name),
             category='set', user=user)
         
         new_set.save()