X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/25881fff0322a55a8c0869557e966afb9c02beb9..7d801e715b70774ff4f2a238045385e093701a8e:/apps/catalogue/forms.py?ds=inline diff --git a/apps/catalogue/forms.py b/apps/catalogue/forms.py index 523b1d636..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 ) @@ -46,7 +47,7 @@ class NewSetForm(forms.Form): 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()