fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix stupid unicode error
[wolnelektury.git]
/
src
/
wolnelektury
/
views.py
diff --git
a/src/wolnelektury/views.py
b/src/wolnelektury/views.py
index
7573df5
..
28ce223
100644
(file)
--- a/
src/wolnelektury/views.py
+++ b/
src/wolnelektury/views.py
@@
-4,11
+4,12
@@
#
from datetime import date, datetime
import feedparser
#
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.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
from django.core.cache import cache
from django.http import HttpResponse, HttpResponseRedirect
from django.shortcuts import render
@@
-22,7
+23,7
@@
from catalogue.models import Book, Collection, Tag, Fragment
from ssify import ssi_included
from social.utils import get_or_choose_cite
from ssify import ssi_included
from social.utils import get_or_choose_cite
-from wolnelektury.forms import RegistrationForm
+from wolnelektury.forms import RegistrationForm
, SocialSignupForm
def main_page(request):
def main_page(request):
@@
-115,7
+116,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'),
}
@@
-186,5
+187,13
@@
def widget(request):
return render(request, 'widget.html')
return render(request, 'widget.html')
+class SocialSignupView(SignupView):
+ form_class = SocialSignupForm
+
+
def exception_test(request):
def exception_test(request):
- raise Exception('Exception test')
\ No newline at end of file
+ msg = request.GET.get('msg')
+ if msg:
+ raise Exception('Exception test: %s' % msg)
+ else:
+ raise Exception('Exception test')
\ No newline at end of file