Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Move back the ingredient overview, seems to be ok

Roland Geider8dec6b135239
diff --git a/wger/core/templates/navigation.html b/wger/core/templates/navigation.html
index 7f8c9f596..14eefac3a 100644
--- a/wger/core/templates/navigation.html
+++ b/wger/core/templates/navigation.html
@@ -174,6 +174,11 @@
{% translate "Daily calories calculator" %}
</a>
</li>
+ <li>
+ <a class="dropdown-item" href="{% url 'nutrition:ingredient:list' %}">
+ {% translate "Ingredient overview" %}
+ </a>
+ </li>
{% if perms.nutrition %}
<li class="dropdown-divider"></li>
<li class="dropdown-header">{% translate "Administration" %}</li>
@@ -182,11 +187,6 @@
{% translate "Ingredient weight units" %}
</a>
</li>
- <li>
- <a class="dropdown-item" href="{% url 'nutrition:ingredient:list' %}">
- {% translate "Ingredient overview" %}
- </a>
- </li>
{% endif %}
</ul>
</li>
diff --git a/wger/nutrition/views/ingredient.py b/wger/nutrition/views/ingredient.py
index d4ae9f6e2..0c18e38c0 100644
--- a/wger/nutrition/views/ingredient.py
+++ b/wger/nutrition/views/ingredient.py
@@ -57,7 +57,6 @@ from wger.utils.generic_views import (
)
from wger.utils.language import load_language
-
logger = logging.getLogger(__name__)
@@ -83,15 +82,17 @@ class IngredientListView(ListView):
return Ingredient.objects.filter(language=language)
-# Cache for one week
-@cache_page(settings.WGER_SETTINGS['INGREDIENT_CACHE_TTL'])
def view(request, pk, slug=None):
context = {}
ingredient = cache.get(cache_mapper.get_ingredient_key(int(pk)))
if not ingredient:
ingredient = get_object_or_404(Ingredient, pk=pk)
- cache.set(cache_mapper.get_ingredient_key(ingredient), ingredient)
+ cache.set(
+ cache_mapper.get_ingredient_key(ingredient),
+ ingredient,
+ settings.WGER_SETTINGS['INGREDIENT_CACHE_TTL'],
+ )
context['ingredient'] = ingredient
context['image'] = ingredient.get_image(request)
context['form'] = UnitChooserForm(