Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Correctly iterate over the nutritrion dictionary

Roland Geider2c52c3d5daba
diff --git a/wger/nutrition/models.py b/wger/nutrition/models.py
index 74d3d4107..4a2baf7cb 100644
--- a/wger/nutrition/models.py
+++ b/wger/nutrition/models.py
@@ -638,7 +638,7 @@ class MealItem(models.Model):
# If necessary, convert weight units
if not use_metric:
- for key, value in nutritional_info.iteritems():
+ for key, value in nutritional_info.items():
# Energy is not a weight!
if key == 'energy':
diff --git a/wger/software/templates/changelog.html b/wger/software/templates/changelog.html
index f77c82720..81029ae0e 100644
--- a/wger/software/templates/changelog.html
+++ b/wger/software/templates/changelog.html
@@ -72,6 +72,7 @@
</li>
<li>
Other improvements and bugfixes
+ <a href="https://github.com/rolandgeider/wger/issues/242">#242</a>
<a href="https://github.com/rolandgeider/wger/issues/238">#238</a>
<a href="https://github.com/rolandgeider/wger/issues/236">#236</a>
<a href="https://github.com/rolandgeider/wger/issues/206">#206</a>