better login/register page (new default login)

[wolnelektury.git] / src / wolnelektury / views.py

diff --git a/src/wolnelektury/views.py b/src/wolnelektury/views.py
index 265f766..6108122 100644 (file)
--- a/src/wolnelektury/views.py
+++ b/src/wolnelektury/views.py
@@ -22,6 +22,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

 
 
 def main_page(request):
 
 
 def main_page(request):


@@ -83,7 +84,7 @@ class LoginFormView(AjaxableFormView):
 
 
 class RegisterFormView(AjaxableFormView):
 
 
 class RegisterFormView(AjaxableFormView):

-    form_class = UserCreationForm
+    form_class = RegistrationForm

     template = "auth/register.html"
     placeholdize = True
     title = _('Register')
     template = "auth/register.html"
     placeholdize = True
     title = _('Register')


@@ -114,7 +115,7 @@ class LoginRegisterFormView(LoginFormView):
 
     def extra_context(self, request, obj):
         return {
 
     def extra_context(self, request, obj):
         return {

-            "register_form": placeholdized(UserCreationForm(prefix='register')),
+            "register_form": placeholdized(RegistrationForm(prefix='register')),

             "register_submit": _('Register'),
         }
 
             "register_submit": _('Register'),
         }
 


@@ -183,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