Correctly iterate over the nutritrion dictionary

Fixes wger-project#242
yanqian · Nov 15, 2015 · 2c52c3d · 2c52c3d
1 parent ffe8f35
commit 2c52c3d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/wger/nutrition/models.py b/wger/nutrition/models.py
@@ -638,7 +638,7 @@ def get_nutritional_values(self, use_metric=True):
 
         # 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
@@ -72,6 +72,7 @@ <h4>2015-XX-XX</h4>
     </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>