From 81c304f38b4e9b4e99e67df00e251f43cbb42506 Mon Sep 17 00:00:00 2001
From: Christian Dresen <c.dresen@fh-muenster.de>
Date: Fri, 23 Sep 2016 22:02:39 +0200
Subject: [PATCH] [WarpInfra] Several Fixes
---
www/web/warpauth/views/register.py | 2 ++
www/web/warpzone/settings.py | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/www/web/warpauth/views/register.py b/www/web/warpauth/views/register.py
index 6dd84b7..da1936e 100644
--- a/www/web/warpauth/views/register.py
+++ b/www/web/warpauth/views/register.py
@@ -33,6 +33,8 @@ def register(request):
except ValidationError as e:
page_context["error"] = _("err_invalid_email_format")
+ page_context["error"] = ""
+
if username == "" or email == "" or password == "" or password2 == "":
page_context['error'] = _("err_fill_all_fields")
elif not re.search(r'^\w+$', username):
diff --git a/www/web/warpzone/settings.py b/www/web/warpzone/settings.py
index 2b30396..0f4fb0c 100644
--- a/www/web/warpzone/settings.py
+++ b/www/web/warpzone/settings.py
@@ -42,6 +42,8 @@ SECRET_KEY = config.get('security','SECRET_KEY')
# DEBUG
DEBUG = config.getboolean('debug','DEBUG')
+ALLOWED_HOSTS = [config.get('security','ALLOWED_HOSTS')]
+
LOGIN_URL = 'two_factor:login'
LOGOUT_URL = 'logout'
LOGIN_REDIRECT_URL = '/'
@@ -49,8 +51,6 @@ LOGIN_REDIRECT_URL = '/'
MEDIA_ROOT = 'templates/media/'
MEDIA_URL = '/media/'
-ALLOWED_HOSTS = []
-
INSTALLED_APPS = (
'django.contrib.admin',
'django.contrib.auth',
--
GitLab