X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/e140252afe125530e4785d796958ab42fb12988d..f083ac4cb1be9bb6c14ce2045be90e0cdf23508e:/src/wolnelektury/views.py diff --git a/src/wolnelektury/views.py b/src/wolnelektury/views.py index c1792806f..a5db0a83f 100644 --- a/src/wolnelektury/views.py +++ b/src/wolnelektury/views.py @@ -4,11 +4,12 @@ # from datetime import date, datetime import feedparser +from allauth.socialaccount.views import SignupView from django.conf import settings from django.contrib import auth from django.contrib.auth.decorators import login_required -from django.contrib.auth.forms import UserCreationForm, AuthenticationForm +from django.contrib.auth.forms import AuthenticationForm from django.core.cache import cache from django.http import HttpResponse, HttpResponseRedirect from django.shortcuts import render @@ -21,11 +22,15 @@ from ajaxable.utils import placeholdized 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, SocialSignupForm + 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'): @@ -35,10 +40,10 @@ def main_page(request): # pass # FIXME: find this theme and books properly. - if Fragment.objects.count(): + if Fragment.objects.exists(): while True: ctx['theme'] = Tag.objects.filter(category='theme').order_by('?')[:1][0] - tf = Fragment.tagged.with_any([ctx['theme']]).order_by('?')[:100] + tf = Fragment.tagged.with_any([ctx['theme']]).select_related('book').order_by('?')[:100] if not tf: continue ctx['theme_fragment'] = tf[0] @@ -80,7 +85,7 @@ class LoginFormView(AjaxableFormView): class RegisterFormView(AjaxableFormView): - form_class = UserCreationForm + form_class = RegistrationForm template = "auth/register.html" placeholdize = True title = _('Register') @@ -111,7 +116,7 @@ class LoginRegisterFormView(LoginFormView): def extra_context(self, request, obj): return { - "register_form": placeholdized(UserCreationForm(prefix='register')), + "register_form": placeholdized(RegistrationForm(prefix='register')), "register_submit": _('Register'), } @@ -180,3 +185,19 @@ 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') + + +class SocialSignupView(SignupView): + form_class = SocialSignupForm + + +def exception_test(request): + msg = request.GET.get('msg') + if msg: + raise Exception('Exception test: %s' % msg) + else: + raise Exception('Exception test') + + +def post_test(request): + return render(request, 'post_test.html', {'action': '/api/reading/jego-zasady/complete/'})