update dg

membership/views.py

@@ -1,13 +1,12 @@
 from django.shortcuts import render, redirect
 from django.views.generic import View
-from django.contrib.auth import authenticate, login
 from django.views.decorators.cache import cache_control
 from django.conf import settings
 from django.db.models import Q
 from django.utils.translation import get_language
 from django.contrib.auth import logout
 from django.http import HttpResponseRedirect
-from django.core.urlresolvers import  reverse_lazy,reverse
+from django.contrib.auth import login
 
 from .models import CustomUser
 from .forms import (LoginForm, RegisterForm, PaymentForm)
@@ -97,14 +96,17 @@ class LoginRegistrationView(View):
                 return render(request, 'templates/success.html')
             else:
                 return render(request, 'templates/error.html')
-
         elif email and password and not name:
-            user = authenticate(email=email, password=password)
-            if user:
-                login(request, user)
-                return redirect('membership')
+            form = LoginForm(request.POST)
+            if form.is_valid():
+                user = form.login(request)
+                if user:
+                    login(request, user)
+                    return redirect('membership')
             else:
-                return redirect('login')
+                registration_form = RegisterForm()
+                return render(request,'templates/login.html', context={'login_form':form,'register_form':registration_form})
+
 
 
 class MembershipView(View):