fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Poprawienie stylów strony sponsorów.
[wolnelektury.git]
/
apps
/
catalogue
/
forms.py
diff --git
a/apps/catalogue/forms.py
b/apps/catalogue/forms.py
index
2d23b79
..
48faeb1
100644
(file)
--- a/
apps/catalogue/forms.py
+++ b/
apps/catalogue/forms.py
@@
-2,8
+2,16
@@
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.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):
class SearchForm(forms.Form):
@@
-13,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
, gatunek, …
'
+ 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))
@@
-31,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
)
@@
-46,7
+54,7
@@
class NewSetForm(forms.Form):
def save(self, user, commit=True):
name = self.cleaned_data['name']
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()
category='set', user=user)
new_set.save()