Login redirects properly if user.is_authenticated()

newtheatre · Jan 25, 2016 · fc8e2d7 · fc8e2d7
1 parent 4dd65f8
commit fc8e2d7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/tickets/templates/registration/loginform.html b/tickets/templates/registration/loginform.html
@@ -11,14 +11,14 @@ <h4 class="light nnt-orange">Login</h4>
         {% csrf_token %}
           <div class="row">
             <div class="input-field col s12">
-              <input name="{{ form.username.name }}" type="text" class="validate">
+              <input name="{{ form.username.name }}" type="text" class="validate" id="username">
               <label for="{{ form.username.name }}">Username</label>
             </div>
             <div class="input-field col s12">
-              <input name="{{ form.password.name }}" type="password" class="validate">
+              <input name="{{ form.password.name }}" type="password" class="validate" id="password">
               <label for="{{ form.password.name }}">Password</label>
             </div>
-            <button type="submit" value="login" class="btn nnt purple waves-effect waves-dark pad-bottom">
+            <button type="submit" value="login" class="btn nnt purple waves-effect waves-dark pad-bottom" id="submit">
               Login
             </button>
             <div class="input-field col s12">

diff --git a/tickets/views.py b/tickets/views.py
@@ -13,8 +13,7 @@
 import json
 import csv
 
-from django.contrib.auth import authenticate, login, logout
-from django.contrib.auth.views import login
+from django.contrib.auth import authenticate, logout
 from django.contrib.auth.decorators import login_required
 
 from django.views import generic
@@ -39,7 +38,9 @@ def login(request, **kwargs):
         next = request.GET.get('next', '/')
         return HttpResponseRedirect(request.GET.get('next', '/'))
     else:
-        return login(request, authentication_form=forms.login_form)
+        from django.contrib.auth.views import login
+
+        return login(request)
 
 
 def logout_view(request):