Self hosted FLOSS fitness/workout, nutrition and weight tracker
Squash development migrations
Roland Geider3b207b746f08
diff --git a/wger/nutrition/management/commands/download-off-ingredient-images.py b/wger/nutrition/management/commands/download-off-ingredient-images.pyindex a58b4273d..9249ebc9b 100644--- a/wger/nutrition/management/commands/download-off-ingredient-images.py+++ b/wger/nutrition/management/commands/download-off-ingredient-images.py@@ -39,9 +39,9 @@ class Command(BaseCommand):def handle(self, **options):# Make sure off downloads are enabled- settings.WGER_SETTINGS['DOWNLOAD_FROM_OFF'] = True+ settings.WGER_SETTINGS['DOWNLOAD_FROM_OFF'] = True- # Since each MealItem is linked to a NutritionPlan via a Meal we can skip accessing+ # Since each MealItem is linked to a NutritionPlan via a Meal we can skip accessing# NutritionPlan and Meal itself and fetch all MealItems directly instead.meal_items = MealItem.objects.all()meal_item_counter = 0@@ -55,10 +55,9 @@ class Command(BaseCommand):self.stdout.write(f'Processed {meal_item_counter} meal items, 'f'downloaded {download_counter} images'- )-+ )self.stdout.write(f'Processed {meal_item_counter} meal items, downloaded {download_counter} images'- )+ )self.stdout.write(f'Done')diff --git a/wger/nutrition/migrations/0010_merge_0009_auto_20210802_1526_0009_meal_name.py b/wger/nutrition/migrations/0010_merge_0009_auto_20210802_1526_0009_meal_name.pydeleted file mode 100644index 91b650efc..000000000--- a/wger/nutrition/migrations/0010_merge_0009_auto_20210802_1526_0009_meal_name.py+++ /dev/null@@ -1,14 +0,0 @@-# Generated by Django 3.2.3 on 2021-10-06 07:39--from django.db import migrations---class Migration(migrations.Migration):-- dependencies = [- ('nutrition', '0009_auto_20210802_1526'),- ('nutrition', '0009_meal_name'),- ]-- operations = [- ]diff --git a/wger/nutrition/migrations/0011_merge_20220406_2021.py b/wger/nutrition/migrations/0011_merge_20220406_2021.pydeleted file mode 100644index a3ebf1c74..000000000--- a/wger/nutrition/migrations/0011_merge_20220406_2021.py+++ /dev/null@@ -1,14 +0,0 @@-# Generated by Django 3.2.12 on 2022-04-06 18:21--from django.db import migrations---class Migration(migrations.Migration):-- dependencies = [- ('nutrition', '0010_logitem_meal'),- ('nutrition', '0010_merge_0009_auto_20210802_1526_0009_meal_name'),- ]-- operations = [- ]diff --git a/wger/nutrition/migrations/0009_auto_20210802_1526.py b/wger/nutrition/migrations/0012_ingredient_image.pysimilarity index 96%rename from wger/nutrition/migrations/0009_auto_20210802_1526.pyrename to wger/nutrition/migrations/0012_ingredient_image.pyindex 1b313b340..d7e42d580 100644--- a/wger/nutrition/migrations/0009_auto_20210802_1526.py+++ b/wger/nutrition/migrations/0012_ingredient_image.py@@ -1,4 +1,4 @@-# Generated by Django 3.2.3 on 2021-08-02 13:26+# Generated by Django 3.2.14 on 2022-08-09 12:33from django.db import migrations, modelsimport django.db.models.deletion@@ -24,7 +24,7 @@ class Migration(migrations.Migration):dependencies = [('core', '0013_auto_20210726_1729'),- ('nutrition', '0008_auto_20210102_1446'),+ ('nutrition', '0011_alter_logitem_datetime'),]operations = [diff --git a/wger/nutrition/models/ingredient.py b/wger/nutrition/models/ingredient.pyindex d8251156a..07eff9408 100644--- a/wger/nutrition/models/ingredient.py+++ b/wger/nutrition/models/ingredient.py@@ -65,6 +65,7 @@ from .ingredient_category import IngredientCategorylogger = logging.getLogger(__name__)+class Source(Enum):WGER = 'wger'OPEN_FOOD_FACTS = 'Open Food Facts'