X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/4d40d1dc355776bb02fe0c622aa52cc3f396673c..1cdc0e97526e19d73fe5cf3ca92ae937b55790cb:/src/catalogue/templatetags/catalogue_tags.py?ds=sidebyside
diff --git a/src/catalogue/templatetags/catalogue_tags.py b/src/catalogue/templatetags/catalogue_tags.py
index 947fbf261..afb2e7ef5 100644
--- a/src/catalogue/templatetags/catalogue_tags.py
+++ b/src/catalogue/templatetags/catalogue_tags.py
@@ -10,7 +10,6 @@ from django.conf import settings
from django import template
from django.template import Node, Variable, Template, Context
from django.core.urlresolvers import reverse
-from django.contrib.auth.forms import UserCreationForm, AuthenticationForm
from django.utils.cache import add_never_cache_headers
from django.utils.translation import ugettext as _
@@ -24,22 +23,6 @@ from picture.models import Picture
register = template.Library()
-class RegistrationForm(UserCreationForm):
- def as_ul(self):
- """Returns this form rendered as HTML
s -- excluding the ."""
- return self._html_output(
- u'%(errors)s%(label)s %(field)s%(help_text)s', u'%s',
- '', u' %s', False)
-
-
-class LoginForm(AuthenticationForm):
- def as_ul(self):
- """Returns this form rendered as HTML s -- excluding the ."""
- return self._html_output(
- u'%(errors)s%(label)s %(field)s%(help_text)s', u'%s',
- '', u' %s', False)
-
-
def iterable(obj):
try:
iter(obj)
@@ -228,16 +211,6 @@ def all_editors(extra_info):
for person in sorted(set(editors)))
-@register.simple_tag
-def user_creation_form():
- return RegistrationForm(prefix='registration').as_ul()
-
-
-@register.simple_tag
-def authentication_form():
- return LoginForm(prefix='login').as_ul()
-
-
@register.tag
def catalogue_url(parser, token):
bits = token.split_contents()
@@ -325,6 +298,7 @@ def tag_list(tags, choices=None, category=None, list_type='books'):
other = other.filter(items__content_type=ct).distinct()
if list_type == 'audiobooks':
other = other.filter(id__in=get_audiobook_tags())
+ other = other.only('name', 'slug', 'category')
else:
other = []
@@ -378,7 +352,7 @@ def plain_list(context, object_list, with_initials=True, by_author=False, choice
initial = obj.get_initial().upper()
if initial != last_initial:
last_initial = initial
- names.append((obj.author_str() if by_author else initial, []))
+ names.append((obj.author_unicode() if by_author else initial, []))
names[-1][1].append(obj)
return {
'paged': paged,