From 9404cf4f4298fddbb20a647a5ecb8e2e0d119d8d Mon Sep 17 00:00:00 2001
From: Christian Dresen <c.dresen@fh-muenster.de>
Date: Fri, 23 Sep 2016 18:41:27 +0200
Subject: [PATCH] [WarpMain] Fixed refactor errors
---
.../reset_password/change_password.html | 2 +-
www/web/warpauth/views/profile.py | 10 +++---
www/web/warpauth/views/register.py | 32 +++++++++----------
3 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/www/web/warpauth/templates/warpauth/reset_password/change_password.html b/www/web/warpauth/templates/warpauth/reset_password/change_password.html
index e745328..f82032e 100644
--- a/www/web/warpauth/templates/warpauth/reset_password/change_password.html
+++ b/www/web/warpauth/templates/warpauth/reset_password/change_password.html
@@ -8,7 +8,7 @@
<div class="alert alert-success">
{% trans "password_change_successful" %} {% trans "redirect_within_5_sec_if_not_click" %} <!-- Your password was sucessfully changed. You will be redirected within 5 seconds. If not please click -->
<a href="/login">{% trans "here" %}</a>
- <meta http-equiv="refresh" content="5; url=/login">
+ <meta http-equiv="refresh" content="5; url=/account/login">
</div>
{% else %}
<form class="form" style="max-width: 330px; margin: 0 auto; padding: 40px">
diff --git a/www/web/warpauth/views/profile.py b/www/web/warpauth/views/profile.py
index 7829ebc..c4d3868 100644
--- a/www/web/warpauth/views/profile.py
+++ b/www/web/warpauth/views/profile.py
@@ -16,7 +16,7 @@ from django.conf import settings
##
-def setUserObject(request):
+def set_user_object(request):
page_context['ldap_groups'] = request.user.ldap_user.group_names
page_context['ldap_user_form'] = LdapUserForm(instance=LdapUser.objects.get(uid=str(request.user)))
@@ -26,7 +26,8 @@ def clear_error_messages():
page_context["success_info"] = False
page_context["error_passwd"] = ""
page_context["success_passwd"] = False
- page_context["selected_tab"]=""
+ page_context["selected_tab"] = ""
+
@login_required(login_url=settings.LOGIN_URL, redirect_field_name=None)
def index(request):
@@ -39,7 +40,7 @@ def index(request):
@login_required(login_url=settings.LOGIN_URL, redirect_field_name=None)
def change_information(request):
clear_error_messages()
- setUserObject(request)
+ set_user_object(request)
if request.method != 'POST':
return redirect("profile_index")
@@ -71,7 +72,7 @@ def change_information(request):
user.save()
page_context["success_info"] = True
- setUserObject(request)
+ set_user_object(request)
return HttpResponse(render(request, 'warpauth/profile.html', page_context))
@@ -97,4 +98,3 @@ def change_password(request):
page_context['ldap_groups'] = request.user.ldap_user.group_names
page_context['ldap_user_form'] = LdapUserForm(instance=LdapUser.objects.get(uid=str(request.user)))
return HttpResponse(render(request, 'warpauth/profile.html', page_context))
-
diff --git a/www/web/warpauth/views/register.py b/www/web/warpauth/views/register.py
index 3cc32f6..6dd84b7 100644
--- a/www/web/warpauth/views/register.py
+++ b/www/web/warpauth/views/register.py
@@ -19,7 +19,7 @@ def send_token(token):
def register(request):
- pages['success'] = False
+ page_context['success'] = False
if request.method == "POST":
username = request.POST['username']
@@ -31,15 +31,15 @@ def register(request):
try:
f.clean(email)
except ValidationError as e:
- pages["error"] = _("err_invalid_email_format")
+ page_context["error"] = _("err_invalid_email_format")
if username == "" or email == "" or password == "" or password2 == "":
- pages['error'] = _("err_fill_all_fields")
+ page_context['error'] = _("err_fill_all_fields")
elif not re.search(r'^\w+$', username):
- pages['error'] = _("err_invalid_username")
+ page_context['error'] = _("err_invalid_username")
elif password != password2:
- pages['error'] = _("err_passwords_not_matching")
- elif not pages["error"]:
+ page_context['error'] = _("err_passwords_not_matching")
+ elif not page_context["error"]:
u = LdapUser.objects.filter(uid=username)
if u.count() == 0:
user = LdapUser()
@@ -61,13 +61,13 @@ def register(request):
token.save()
ret = send_token(token)
if not ret:
- pages["error"] = _("err_sending_mail") #Error while sending the email. Please contact the administrator.
+ page_context["error"] = _("err_sending_mail") #Error while sending the email. Please contact the administrator.
else:
- pages['success'] = True
+ page_context['success'] = True
else:
- pages['error'] = _("err_username_not_available")
+ page_context['error'] = _("err_username_not_available")
- return HttpResponse(render(request, 'warpauth/register/register.html', pages))
+ return HttpResponse(render(request, 'warpauth/register/register.html', page_context))
def activate(request, token=None):
@@ -78,9 +78,9 @@ def activate(request, token=None):
group.save()
activation_token.delete()
except ObjectDoesNotExist:
- pages["error"] = _("err_token_invalid")
+ page_context["error"] = _("err_token_invalid")
- return HttpResponse(render(request, 'warpauth/register/activate.html', pages))
+ return HttpResponse(render(request, 'warpauth/register/activate.html', page_context))
def resend_token(request):
if request.method == "POST":
@@ -89,9 +89,9 @@ def resend_token(request):
if token.email == request.POST["email"]:
ret = send_token(token)
if not ret:
- pages["error"] = _("err_processing_request")
- pages["success"] = True
+ page_context["error"] = _("err_processing_request")
+ page_context["success"] = True
except ObjectDoesNotExist:
- pages["error"] = _("err_processing_request")
+ page_context["error"] = _("err_processing_request")
- return HttpResponse(render(request, 'warpauth/register/resend_token.html', pages))
+ return HttpResponse(render(request, 'warpauth/register/resend_token.html', page_context))
--
GitLab