Skip to content

Commit

Permalink
Merge pull request arocks#15 from arocks/remember_me_fix
Browse files Browse the repository at this point in the history
Moved 'remember me' functionality from form to view
  • Loading branch information
arocks committed Mar 5, 2015
2 parents 9b33bce + f49b5d6 commit ce0ec8b
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
9 changes: 0 additions & 9 deletions src/accounts/forms.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from __future__ import unicode_literals
from django.contrib.auth.forms import AuthenticationForm
from django import forms
from django.conf import settings
from crispy_forms.helper import FormHelper
from crispy_forms.layout import Layout, Div, Submit, HTML, Button, Row, Field
from crispy_forms.bootstrap import AppendedText, PrependedText, FormActions
Expand All @@ -28,14 +27,6 @@ def __init__(self, *args, **kwargs):
css_class="btn btn-lg btn-primary btn-block"),
)

def confirm_login_allowed(self, user):
super(LoginForm, self).confirm_login_allowed(user)
remember_me = self.cleaned_data.get('remember_me')
if remember_me is True:
ONE_MONTH = 30*24*60*60
expiry = getattr(settings, "KEEP_LOGGED_DURATION", ONE_MONTH)
self.request.session.set_expiry(expiry)


class SignupForm(authtoolsforms.UserCreationForm):

Expand Down
10 changes: 10 additions & 0 deletions src/accounts/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
from django.contrib import messages
from authtools import views as authviews
from braces import views as bracesviews
from django.conf import settings
from . import forms

User = get_user_model()
Expand All @@ -16,6 +17,15 @@ class LoginView(bracesviews.AnonymousRequiredMixin,
template_name = "accounts/login.html"
form_class = forms.LoginForm

def form_valid(self, form):
redirect = super(LoginView, self).form_valid(form)
remember_me = form.cleaned_data.get('remember_me')
if remember_me is True:
ONE_MONTH = 30*24*60*60
expiry = getattr(settings, "KEEP_LOGGED_DURATION", ONE_MONTH)
self.request.session.set_expiry(expiry)
return redirect


class LogoutView(authviews.LogoutView):
url = reverse_lazy('home')
Expand Down

0 comments on commit ce0ec8b

Please sign in to comment.