Self hosted FLOSS fitness/workout, nutrition and weight tracker
Fix bug preventing users from generating demo entries
Roland Geider074f01a69d64
diff --git a/wger/core/demo.py b/wger/core/demo.pyindex 5407b77bb..22b2051bc 100644--- a/wger/core/demo.py+++ b/wger/core/demo.py@@ -23,6 +23,7 @@ import uuid# Djangofrom django.contrib.auth import authenticatefrom django.contrib.auth.models import User+from django.http import HttpRequestfrom django.utils.translation import gettext as _# wger@@ -60,7 +61,7 @@ UUID_CRUNCHES = 'b186f1f8-4957-44dc-bf30-d0b00064ce6f'UUID_LEG_RAISES = 'c2078aac-e4e2-4103-a845-6252a3eb795e'-def create_temporary_user():+def create_temporary_user(request: HttpRequest):"""Creates a temporary user"""@@ -75,7 +76,7 @@ def create_temporary_user():user_profile.age = 25user_profile.height = 175user_profile.save()- user = authenticate(username=username, password=password)+ user = authenticate(request=request, username=username, password=password)return userdiff --git a/wger/core/models/profile.py b/wger/core/models/profile.pyindex 8edda7b73..ba7ca646f 100644--- a/wger/core/models/profile.py+++ b/wger/core/models/profile.py@@ -523,8 +523,8 @@ by the US Department of Agriculture. It is extremely complete, with around"""if (not WeightEntry.objects.filter(user=self.user).exists() or (- datetime.date.today() - WeightEntry.objects.filter(user=self.user).latest().date- > datetime.timedelta(days=3)+ datetime.date.today() - WeightEntry.objects.filter(user=self.user).latest().date >+ datetime.timedelta(days=3))):entry = WeightEntry()diff --git a/wger/core/tests/test_temporary_users.py b/wger/core/tests/test_temporary_users.pyindex 253a14cfb..d910d5a38 100644--- a/wger/core/tests/test_temporary_users.py+++ b/wger/core/tests/test_temporary_users.py@@ -19,6 +19,7 @@ import random# Djangofrom django.contrib.auth.models import Userfrom django.core.management import call_command+from django.http import HttpRequestfrom django.urls import reverse# wger@@ -183,14 +184,16 @@ class DemoUserTestCase(WgerTestCase):Tests that old demo users are deleted by the management command"""+ request = HttpRequest()+# Create some new demo usersfor i in range(0, 15):- create_temporary_user()+ create_temporary_user(request)User.objects.filter().update(date_joined='2013-01-01 00:00+01:00')# These ones keep the date_joined field- create_temporary_user()- create_temporary_user()+ create_temporary_user(request)+ create_temporary_user(request)# Check and deleteself.assertEqual(self.count_temp_users(), 18)diff --git a/wger/core/tests/test_user.py b/wger/core/tests/test_user.pyindex 0d50b557f..059fe05c9 100644--- a/wger/core/tests/test_user.py+++ b/wger/core/tests/test_user.py@@ -17,6 +17,7 @@ from unittest import TestCase# Djangofrom django.contrib.auth.models import User+from django.http import HttpRequestfrom django.urls import (reverse,reverse_lazy,@@ -266,6 +267,7 @@ class UserDetailPageTestCase2(WgerAccessTestCase):class UserTrustworthinessTestCase(WgerTestCase):+ request = HttpRequest()def test_temporary_user_no_permissions(self):"""@@ -274,7 +276,7 @@ class UserTrustworthinessTestCase(WgerTestCase):"""# Get a temporary user- user = create_temporary_user()+ user = create_temporary_user(self.request)# User does not pass trustworthiness checkself.assertFalse(user.userprofile.is_trustworthy)@@ -285,7 +287,7 @@ class UserTrustworthinessTestCase(WgerTestCase):"""# Get a temporary user- user = create_temporary_user()+ user = create_temporary_user(self.request)user.userprofile.is_temporary = Falseuser.userprofile.email_verified = Trueuser.date_joined = datetime.datetime.now()@@ -299,7 +301,7 @@ class UserTrustworthinessTestCase(WgerTestCase):"""# Get a temporary user- user = create_temporary_user()+ user = create_temporary_user(self.request)user.userprofile.is_temporary = Falseuser.userprofile.email_verified = Falseuser.date_joined = datetime.datetime.now() - datetime.timedelta(days=30)@@ -313,7 +315,7 @@ class UserTrustworthinessTestCase(WgerTestCase):"""# Get a temporary user- user = create_temporary_user()+ user = create_temporary_user(self.request)user.userprofile.is_temporary = Falseuser.userprofile.email_verified = Trueuser.date_joined = datetime.datetime.now() - datetime.timedelta(days=30)@@ -327,7 +329,7 @@ class UserTrustworthinessTestCase(WgerTestCase):"""# Get a temporary user- user = create_temporary_user()+ user = create_temporary_user(self.request)user.is_superuser = Trueuser.userprofile.is_temporary = Falseuser.userprofile.email_verified = Falsediff --git a/wger/core/views/misc.py b/wger/core/views/misc.pyindex e360c9dee..7dad28d50 100644--- a/wger/core/views/misc.py+++ b/wger/core/views/misc.py@@ -88,7 +88,7 @@ def demo_entries(request):# If we reach this from a page that has no user created by the# middleware, do that nowif not request.user.is_authenticated:- user = create_temporary_user()+ user = create_temporary_user(request)django_login(request, user)# OK, continue@@ -157,7 +157,6 @@ def dashboard(request):context['weekdays'] = week_day_resultif plan:-# Load the nutritional infocontext['nutritional_info'] = plan.get_nutritional_values()diff --git a/wger/utils/middleware.py b/wger/utils/middleware.pyindex 9a5884acf..d86654bb6 100644--- a/wger/utils/middleware.py+++ b/wger/utils/middleware.py@@ -65,11 +65,10 @@ def get_user(request):# Django didn't find a user, so create one nowif settings.WGER_SETTINGS['ALLOW_GUEST_USERS'] and \- request.method == 'GET' and \- create_user and not user.is_authenticated:-+ request.method == 'GET' and \+ create_user and not user.is_authenticated:logger.debug('creating a new guest user now')- user = create_temporary_user()+ user = create_temporary_user(request)django_login(request, user)request._cached_user = user@@ -116,9 +115,7 @@ class JavascriptAJAXRedirectionMiddleware(MiddlewareMixin):"""def process_response(self, request, response):-if request.META.get('HTTP_X_WGER_NO_MESSAGES') and b'has-error' not in response.content:-logger.debug('Sending X-wger-redirect')response['X-wger-redirect'] = request.pathresponse.content = request.path