Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Merge branch 'master' into feature/ingredient-images

Roland Geider62694cd0e134
diff --cc extras/docker/development/settings.py
index 08a038bee,d5c3feb51..f6ce7994b
--- a/extras/docker/development/settings.py
+++ b/extras/docker/development/settings.py
@@@ -94,8 -94,8 +94,9 @@@ DEFAULT_FROM_EMAIL = WGER_SETTINGS['EMA
WGER_SETTINGS["ALLOW_REGISTRATION"] = env.bool("ALLOW_REGISTRATION", True)
WGER_SETTINGS["ALLOW_GUEST_USERS"] = env.bool("ALLOW_GUEST_USERS", True)
WGER_SETTINGS["ALLOW_UPLOAD_VIDEOS"] = env.bool("ALLOW_UPLOAD_VIDEOS", True)
+ WGER_SETTINGS["MIN_ACCOUNT_AGE_TO_TRUST"] = env.int("MIN_ACCOUNT_AGE_TO_TRUST", 21) # in days
WGER_SETTINGS["EXERCISE_CACHE_TTL"] = env.int("EXERCISE_CACHE_TTL", 3600)
+WGER_SETTINGS["USE_CELERY"] = env.bool("USE_CELERY", False)
# Cache
diff --cc wger/nutrition/api/views.py
index e9431cc13,fb12cd1e4..9472cd746
--- a/wger/nutrition/api/views.py
+++ b/wger/nutrition/api/views.py
@@@ -160,40 -150,27 +157,40 @@@ def search(request)
requested_language = request.GET.get('language', None)
results = []
json_response = {}
- if term:
- if requested_language:
- languages = [load_language(requested_language)]
+
+ if not term:
+ return Response(json_response)
+
+ language = load_language(requested_language)
+ ingredients = Ingredient.objects.filter(
+ name__icontains=term,
+ language=language,
+ status=Ingredient.STATUS_ACCEPTED,
- )
++ )[:100]
+
+ for ingredient in ingredients:
++ if hasattr(ingredient, 'image'):
++ image_obj = ingredient.image
++ image = image_obj.image.url
++ t = get_thumbnailer(image_obj.image)
++ thumbnail = t.get_thumbnail(aliases.get('micro_cropped')).url
+ else:
- languages = load_ingredient_languages(request)
- ingredients = Ingredient.objects.filter(
- name__icontains=term,
- language__in=languages,
- status=Ingredient.STATUS_ACCEPTED,
- )[:100]
-
- for ingredient in ingredients:
- if hasattr(ingredient, 'image'):
- image_obj = ingredient.image
- image = image_obj.image.url
- t = get_thumbnailer(image_obj.image)
- thumbnail = t.get_thumbnail(aliases.get('micro_cropped')).url
- else:
- ingredient.get_image(request)
- image = None
- thumbnail = None
-
- ingredient_json = {
- 'value': ingredient.name,
- 'data': {
- 'id': ingredient.id,
- 'name': ingredient.name,
- 'image': image,
- 'image_thumbnail': thumbnail
- }
++ ingredient.get_image(request)
++ image = None
++ thumbnail = None
++
+ ingredient_json = {
+ 'value': ingredient.name,
+ 'data': {
+ 'id': ingredient.id,
+ 'name': ingredient.name,
++ 'image': image,
++ 'image_thumbnail': thumbnail
}
- results.append(ingredient_json)
- json_response['suggestions'] = results
+ }
+ results.append(ingredient_json)
+ json_response['suggestions'] = results
+
return Response(json_response)
diff --cc wger/settings_global.py
index 266a5a0ab,daa0d525e..ef17c12b0
--- a/wger/settings_global.py
+++ b/wger/settings_global.py
@@@ -482,8 -483,7 +484,9 @@@ WGER_SETTINGS =
'ALLOW_GUEST_USERS': True,
'ALLOW_REGISTRATION': True,
'ALLOW_UPLOAD_VIDEOS': False,
+ 'USE_CELERY': False,
+ 'DOWNLOAD_FROM_OFF': False,
+ 'MIN_ACCOUNT_AGE_TO_TRUST': 21,
'EMAIL_FROM': 'wger Workout Manager <[email protected]>',
'EXERCISE_CACHE_TTL': 3600,
'TWITTER': False,