aboutsummaryrefslogtreecommitdiffstats
path: root/servo/views/account.py
diff options
context:
space:
mode:
authorFilipp Lepalaan <filipp@mac.com>2017-04-24 22:26:17 +0300
committerFilipp Lepalaan <filipp@mac.com>2017-04-24 22:26:17 +0300
commit85e92ff2ee4ca30e0144790a1d95b8023595bf2f (patch)
treeff38ef1fe1957e00732ab43f891b7915a7a97274 /servo/views/account.py
parent5934831e5921b78651418a589da3c67ed320a309 (diff)
downloadServo-85e92ff2ee4ca30e0144790a1d95b8023595bf2f.tar.gz
Servo-85e92ff2ee4ca30e0144790a1d95b8023595bf2f.tar.bz2
Servo-85e92ff2ee4ca30e0144790a1d95b8023595bf2f.zip
Cleanup
Diffstat (limited to 'servo/views/account.py')
-rw-r--r--servo/views/account.py16
1 files changed, 7 insertions, 9 deletions
diff --git a/servo/views/account.py b/servo/views/account.py
index 9f0da54..2b50959 100644
--- a/servo/views/account.py
+++ b/servo/views/account.py
@@ -1,7 +1,6 @@
# -*- coding: utf-8 -*-
import csv
-import pytz
from datetime import date
from django.contrib import auth
@@ -23,9 +22,7 @@ from servo.forms.account import ProfileForm, RegistrationForm, LoginForm
def settings(request):
- """
- User editing their profile preferences
- """
+ """User editing their profile."""
title = _("Profile Settings")
form = ProfileForm(instance=request.user)
@@ -37,7 +34,7 @@ def settings(request):
user = form.save()
messages.success(request, _("Settings saved"))
User.refresh_nomail()
-
+
if form.cleaned_data['password1']:
request.user.set_password(form.cleaned_data['password1'])
request.user.save()
@@ -89,13 +86,14 @@ def login(request):
if 'username' in request.POST:
+ form = LoginForm(request.POST)
+
if request.session.test_cookie_worked():
request.session.delete_test_cookie()
else:
- error = {'message': _('Please enable cookies to use this system')}
- return render(request, 'checkin/error.html', error)
-
- form = LoginForm(request.POST)
+ message = _('Please enable cookies to use this system')
+ url = request.path
+ return render(request, 'checkin/error.html', locals())
if form.is_valid():
user = auth.authenticate(