fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
no ssi for book wide
[wolnelektury.git]
/
src
/
wolnelektury
/
views.py
diff --git
a/src/wolnelektury/views.py
b/src/wolnelektury/views.py
index
1a6738b
..
6108122
100644
(file)
--- a/
src/wolnelektury/views.py
+++ b/
src/wolnelektury/views.py
@@
-21,11
+21,15
@@
from ajaxable.utils import placeholdized
from catalogue.models import Book, Collection, Tag, Fragment
from ssify import ssi_included
from catalogue.models import Book, Collection, Tag, Fragment
from ssify import ssi_included
+from social.utils import get_or_choose_cite
+from wolnelektury.forms import RegistrationForm
+
def main_page(request):
ctx = {
'last_published': Book.objects.exclude(cover_thumb='').filter(parent=None).order_by('-created_at')[:6],
def main_page(request):
ctx = {
'last_published': Book.objects.exclude(cover_thumb='').filter(parent=None).order_by('-created_at')[:6],
- 'theme_books': []
+ 'theme_books': [],
+ 'cite': get_or_choose_cite(request),
}
# for category in ('author', 'epoch', 'genre', 'kind'):
}
# for category in ('author', 'epoch', 'genre', 'kind'):
@@
-80,7
+84,7
@@
class LoginFormView(AjaxableFormView):
class RegisterFormView(AjaxableFormView):
class RegisterFormView(AjaxableFormView):
- form_class =
UserCre
ationForm
+ form_class =
Registr
ationForm
template = "auth/register.html"
placeholdize = True
title = _('Register')
template = "auth/register.html"
placeholdize = True
title = _('Register')
@@
-111,7
+115,7
@@
class LoginRegisterFormView(LoginFormView):
def extra_context(self, request, obj):
return {
def extra_context(self, request, obj):
return {
- "register_form": placeholdized(
UserCre
ationForm(prefix='register')),
+ "register_form": placeholdized(
Registr
ationForm(prefix='register')),
"register_submit": _('Register'),
}
"register_submit": _('Register'),
}
@@
-180,3
+184,11
@@
def latest_blog_posts(request, feed_url=None, posts_to_show=5):
@ssi_included(use_lang=False)
def widget(request):
return render(request, 'widget.html')
@ssi_included(use_lang=False)
def widget(request):
return render(request, 'widget.html')
+
+
+def exception_test(request):
+ msg = request.GET.get('msg')
+ if msg:
+ raise Exception('Exception test: %s' % msg)
+ else:
+ raise Exception('Exception test')
\ No newline at end of file