diff --git a/www/web/warpauth/views/register.py b/www/web/warpauth/views/register.py index 6dd84b7d23e2ff075447b9bd51a98eabb25ea7f4..da1936e798837cfab4db5a9c177ce2b2af878945 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/warpfood/views.py b/www/web/warpfood/views.py index d5e51d5ba9602fe6aa6eca4bc5766bb7bee8e166..588ba2bc4f7973c74db5b7e5bf8a7be286cfd307 100644 --- a/www/web/warpfood/views.py +++ b/www/web/warpfood/views.py @@ -9,12 +9,12 @@ from django.http import HttpResponse from datetime import datetime from django.conf import settings from datetime import datetime, timedelta + # # ToDo: Insert TemplateTag for Euro Format # ToDo: Username with hidden Field. Maybe insecure # - def index(request): form = FoodSheetForm() if request.user.is_superuser: @@ -22,11 +22,10 @@ def index(request): form = FoodSheetForm(request.POST) if form.is_valid(): form.save() - """ - time_threshold = datetime.now() - timedelta(hours=24) - print(timedelta(hours=24)) - print(len(FoodSheet.objects.filter(order_time__lt=time_threshold))) #) #.delete() - """ + + time_threshold = datetime.now() - timedelta(days=1) + FoodSheet.objects.filter(order_time__lte=time_threshold).delete() + page_context['pizza_services'] = FoodService.objects.all() page_context['create_food_sheet'] = form page_context['food_sheets'] = FoodSheet.objects.order_by("-id") diff --git a/www/web/warpzone/settings.py b/www/web/warpzone/settings.py index 2b30396825a545d95822afd23271d90f9ed4ae9a..0f4fb0c971abcd6c950a86597348f87ee7b946a3 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',