Self hosted FLOSS fitness/workout, nutrition and weight tracker
Rename setting
Roland Geider6df082662a26
diff --git a/extras/docker/development/settings.py b/extras/docker/development/settings.pyindex b1b8cca77..2919ff60c 100644--- a/extras/docker/development/settings.py+++ b/extras/docker/development/settings.py@@ -93,7 +93,7 @@ EMAIL_FROM_ADDRESS = DEFAULT_FROM_EMAILWGER_SETTINGS["ALLOW_GUEST_USERS"] = env.bool("ALLOW_GUEST_USERS", True)WGER_SETTINGS["ALLOW_REGISTRATION"] = env.bool("ALLOW_REGISTRATION", True)WGER_SETTINGS["ALLOW_UPLOAD_VIDEOS"] = env.bool("ALLOW_UPLOAD_VIDEOS", True)-WGER_SETTINGS["DOWNLOAD_INGREDIENT_IMAGES"] = env.str("DOWNLOAD_INGREDIENT_IMAGES", "WGER")+WGER_SETTINGS["DOWNLOAD_INGREDIENTS_FROM"] = env.str("DOWNLOAD_INGREDIENTS_FROM", "WGER")WGER_SETTINGS["EXERCISE_CACHE_TTL"] = env.int("EXERCISE_CACHE_TTL", 3600)WGER_SETTINGS["MIN_ACCOUNT_AGE_TO_TRUST"] = env.int("MIN_ACCOUNT_AGE_TO_TRUST", 21) # in daysWGER_SETTINGS["SYNC_EXERCISES_CELERY"] = env.bool("SYNC_EXERCISES_CELERY", False)diff --git a/wger/core/checks.py b/wger/core/checks.pyindex 000b37e5a..738339e03 100644--- a/wger/core/checks.py+++ b/wger/core/checks.py@@ -26,12 +26,12 @@ def settings_check(app_configs, **kwargs):)# Only one setting should be set- if settings.WGER_SETTINGS['DOWNLOAD_INGREDIENT_IMAGES'] not in DOWNLOAD_INGREDIENT_OPTIONS:+ if settings.WGER_SETTINGS['DOWNLOAD_INGREDIENTS_FROM'] not in DOWNLOAD_INGREDIENT_OPTIONS:errors.append(Error('Ingredient images configuration error',hint=f'Origin for ingredient images misconfigured. Valid options are '- f'{DOWNLOAD_INGREDIENT_OPTIONS}',+ f'{DOWNLOAD_INGREDIENT_OPTIONS}',obj=settings,id='wger.E001',)diff --git a/wger/core/tests/base_testcase.py b/wger/core/tests/base_testcase.pyindex 8d962882e..b1c4a489c 100644--- a/wger/core/tests/base_testcase.py+++ b/wger/core/tests/base_testcase.py@@ -156,7 +156,7 @@ class BaseTestCase():# https://django-axes.readthedocs.io/en/latest/3_usage.html#authenticating-userssettings.AXES_ENABLED = False- settings.WGER_SETTINGS['DOWNLOAD_INGREDIENT_IMAGES'] = False+ settings.WGER_SETTINGS['DOWNLOAD_INGREDIENTS_FROM'] = Falsesettings.WGER_SETTINGS['USE_CELERY'] = Falsesettings.WGER_SETTINGS['WGER_INSTANCE'] = 'http://localhost:8000'diff --git a/wger/nutrition/management/commands/download-off-ingredient-images.py b/wger/nutrition/management/commands/download-off-ingredient-images.pyindex bdf0c4f30..7a578776a 100644--- a/wger/nutrition/management/commands/download-off-ingredient-images.py+++ b/wger/nutrition/management/commands/download-off-ingredient-images.py@@ -23,7 +23,6 @@ from django.core.management.base import BaseCommandfrom wger.nutrition.models import MealItemfrom wger.nutrition.tasks import fetch_ingredient_image_task-logger = logging.getLogger(__name__)@@ -43,8 +42,8 @@ class Command(BaseCommand):return# Make sure off downloads are enabled- if not settings.WGER_SETTINGS['DOWNLOAD_INGREDIENT_IMAGES']:- self.stdout.write('DOWNLOAD_INGREDIENT_IMAGES not set. Exiting...')+ if not settings.WGER_SETTINGS['DOWNLOAD_INGREDIENTS_FROM']:+ self.stdout.write('DOWNLOAD_INGREDIENTS_FROM not set. Exiting...')return# Since each MealItem is linked to a NutritionPlan via a Meal we can skip accessingdiff --git a/wger/nutrition/sync.py b/wger/nutrition/sync.pyindex b1d9bbebf..cbe6ea99b 100644--- a/wger/nutrition/sync.py+++ b/wger/nutrition/sync.py@@ -60,9 +60,9 @@ def fetch_ingredient_image(pk: int):returnlogger.info(f'Fetching image for ingredient {pk}')- if settings.WGER_SETTINGS['DOWNLOAD_INGREDIENT_IMAGES'] == DOWNLOAD_INGREDIENT_OFF:+ if settings.WGER_SETTINGS['DOWNLOAD_INGREDIENTS_FROM'] == DOWNLOAD_INGREDIENT_OFF:fetch_image_from_off(ingredient)- elif settings.WGER_SETTINGS['DOWNLOAD_INGREDIENT_IMAGES'] == DOWNLOAD_INGREDIENT_WGER:+ elif settings.WGER_SETTINGS['DOWNLOAD_INGREDIENTS_FROM'] == DOWNLOAD_INGREDIENT_WGER:fetch_image_from_wger_instance(ingredient)diff --git a/wger/nutrition/tests/test_tasks.py b/wger/nutrition/tests/test_tasks.pyindex f5d9d17fa..ee60f9e8f 100644--- a/wger/nutrition/tests/test_tasks.py+++ b/wger/nutrition/tests/test_tasks.py@@ -93,7 +93,7 @@ class FetchIngredientImageTestCase(WgerTestCase):ingredient.source_name = 'blabla'ingredient.save()- with self.settings(WGER_SETTINGS={'DOWNLOAD_INGREDIENT_IMAGES': True}):+ with self.settings(WGER_SETTINGS={'DOWNLOAD_INGREDIENTS_FROM': True}):result = fetch_ingredient_image(1)mock_logger.assert_not_called()mock_request.assert_not_called()@@ -109,7 +109,7 @@ class FetchIngredientImageTestCase(WgerTestCase):ingredient.source_name = 'blabla'ingredient.save()- with self.settings(WGER_SETTINGS={'DOWNLOAD_INGREDIENT_IMAGES': False}):+ with self.settings(WGER_SETTINGS={'DOWNLOAD_INGREDIENTS_FROM': False}):result = fetch_ingredient_image(1)mock_logger.assert_not_called()mock_request.assert_not_called()@@ -127,7 +127,7 @@ class FetchIngredientImageTestCase(WgerTestCase):"""with self.settings(- WGER_SETTINGS={'DOWNLOAD_INGREDIENT_IMAGES': DOWNLOAD_INGREDIENT_OFF},+ WGER_SETTINGS={'DOWNLOAD_INGREDIENTS_FROM': DOWNLOAD_INGREDIENT_OFF},TESTING=False,):result = fetch_ingredient_image(1)@@ -165,7 +165,7 @@ class FetchIngredientImageTestCase(WgerTestCase):with self.settings(WGER_SETTINGS={- 'DOWNLOAD_INGREDIENT_IMAGES': DOWNLOAD_INGREDIENT_WGER,+ 'DOWNLOAD_INGREDIENTS_FROM': DOWNLOAD_INGREDIENT_WGER,'WGER_INSTANCE': 'http://localhost:8000'},TESTING=Falsediff --git a/wger/settings_global.py b/wger/settings_global.pyindex 1f11c7d0e..f00610b6d 100644--- a/wger/settings_global.py+++ b/wger/settings_global.py@@ -24,7 +24,6 @@ from datetime import timedelta# wgerfrom wger.utils.constants import DOWNLOAD_INGREDIENT_WGER-"""This file contains the global settings that don't usually need to be changed.For a full list of options, visit:@@ -171,7 +170,7 @@ TEMPLATES = ['django.template.loaders.app_directories.Loader',],'debug':- False+ False},},]@@ -254,7 +253,7 @@ AVAILABLE_LANGUAGES = (LANGUAGE_CODE = 'en'# All translation files are in one place-LOCALE_PATHS = (os.path.join(SITE_ROOT, 'locale'), )+LOCALE_PATHS = (os.path.join(SITE_ROOT, 'locale'),)# Primary keys are AutoFieldsDEFAULT_AUTO_FIELD = 'django.db.models.AutoField'@@ -427,7 +426,7 @@ COMPRESS_ROOT = STATIC_ROOT# Django Rest Framework#REST_FRAMEWORK = {- 'DEFAULT_PERMISSION_CLASSES': ('wger.utils.permissions.WgerPermission', ),+ 'DEFAULT_PERMISSION_CLASSES': ('wger.utils.permissions.WgerPermission',),'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.LimitOffsetPagination','PAGE_SIZE': 20,'PAGINATE_BY_PARAM': 'limit', # Allow client to override, using `?limit=xxx`.@@ -467,7 +466,7 @@ CORS_URLS_REGEX = r'^/api/.*$'## Ignore these URLs if they cause 404#-IGNORABLE_404_URLS = (re.compile(r'^/favicon\.ico$'), )+IGNORABLE_404_URLS = (re.compile(r'^/favicon\.ico$'),)## Password rules@@ -498,7 +497,7 @@ WGER_SETTINGS = {'ALLOW_GUEST_USERS': True,'ALLOW_REGISTRATION': True,'ALLOW_UPLOAD_VIDEOS': False,- 'DOWNLOAD_INGREDIENT_IMAGES': DOWNLOAD_INGREDIENT_WGER,+ 'DOWNLOAD_INGREDIENTS_FROM': DOWNLOAD_INGREDIENT_WGER,'EMAIL_FROM': 'wger Workout Manager <[email protected]>','EXERCISE_CACHE_TTL': 3600,'MIN_ACCOUNT_AGE_TO_TRUST': 21,