sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'release/v18.6.5'

Browse Source
This commit is contained in:
Sander Roosendaal
2022-08-19 09:12:18 +02:00
parent b382d65539 85612b2a47
commit f465da729c
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rowers/tasks.py
View File

@@ -88,7 +88,10 @@ from django.conf import settings
SITE_URL = CFG['site_url'] SITE_URL = CFG['site_url']
SITE_URL_DEV = CFG['site_url'] SITE_URL_DEV = CFG['site_url']
PROGRESS_CACHE_SECRET = CFG['progress_cache_secret'] PROGRESS_CACHE_SECRET = CFG['progress_cache_secret']
SETTINGS_NAME = CFG['settings_name'] try:
SETTINGS_NAME = CFG['settings_name']
except KeyError:
SETTINGS_NAME = 'rowsandall_ap.settings'
try: try:
UPLOAD_SERVICE_URL = CFG['upload_service_url'] UPLOAD_SERVICE_URL = CFG['upload_service_url']
@@ -1218,6 +1221,7 @@ def handle_calctrimp(id,
workout = Workout.objects.get(id=id) workout = Workout.objects.get(id=id)
except Workout.DoesNotExist: except Workout.DoesNotExist:
return 0 return 0
workout.rscore = int(tss) workout.rscore = int(tss)
workout.normp = int(normp) workout.normp = int(normp)
workout.trimp = int(trimp) workout.trimp = int(trimp)