From 93b7e5790d714724c6a750cbd8b584de229f864e Mon Sep 17 00:00:00 2001 From: smilerz Date: Mon, 7 Feb 2022 18:11:38 -0600 Subject: [PATCH] merge clashing commits --- .../migrations/0170_auto_20220207_1848.py | 5 ++-- .../0172_food_child_inherit_fields.py | 18 ------------- cookbook/serializer.py | 26 +++++++++---------- 3 files changed, 16 insertions(+), 33 deletions(-) delete mode 100644 cookbook/migrations/0172_food_child_inherit_fields.py diff --git a/cookbook/migrations/0170_auto_20220207_1848.py b/cookbook/migrations/0170_auto_20220207_1848.py index f6985dc38..7acdaf2ec 100644 --- a/cookbook/migrations/0170_auto_20220207_1848.py +++ b/cookbook/migrations/0170_auto_20220207_1848.py @@ -1,9 +1,10 @@ # Generated by Django 3.2.11 on 2022-02-07 17:48 -import cookbook.models +import django.db.models.deletion from django.conf import settings from django.db import migrations, models -import django.db.models.deletion + +import cookbook.models class Migration(migrations.Migration): diff --git a/cookbook/migrations/0172_food_child_inherit_fields.py b/cookbook/migrations/0172_food_child_inherit_fields.py deleted file mode 100644 index 70098b2b3..000000000 --- a/cookbook/migrations/0172_food_child_inherit_fields.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.2.11 on 2022-02-04 17:11 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('cookbook', '0171_auto_20220202_1340'), - ] - - operations = [ - migrations.AddField( - model_name='food', - name='child_inherit_fields', - field=models.ManyToManyField(blank=True, related_name='child_inherit', to='cookbook.FoodInheritField'), - ), - ] diff --git a/cookbook/serializer.py b/cookbook/serializer.py index a0484e394..5dcbe5d03 100644 --- a/cookbook/serializer.py +++ b/cookbook/serializer.py @@ -1,5 +1,5 @@ from datetime import timedelta - +from decimal import Decimal from gettext import gettext as _ from django.contrib.auth.models import User @@ -12,13 +12,13 @@ from rest_framework.exceptions import NotFound, ValidationError from cookbook.helper.HelperFunctions import str2bool from cookbook.helper.shopping_helper import RecipeShoppingEditor -from cookbook.models import (Automation, BookmarkletImport, Comment, CookLog, CustomFilter, Food, - FoodInheritField, ImportLog, Ingredient, Keyword, MealPlan, MealType, - NutritionInformation, Recipe, RecipeBook, RecipeBookEntry, - RecipeImport, ShareLink, ShoppingList, ShoppingListEntry, - ShoppingListRecipe, Step, Storage, Supermarket, SupermarketCategory, - SupermarketCategoryRelation, Sync, SyncLog, Unit, UserFile, - UserPreference, ViewLog, ExportLog) +from cookbook.models import (Automation, BookmarkletImport, Comment, CookLog, CustomFilter, + ExportLog, Food, FoodInheritField, ImportLog, Ingredient, Keyword, + MealPlan, MealType, NutritionInformation, Recipe, RecipeBook, + RecipeBookEntry, RecipeImport, ShareLink, ShoppingList, + ShoppingListEntry, ShoppingListRecipe, Step, Storage, Supermarket, + SupermarketCategory, SupermarketCategoryRelation, Sync, SyncLog, Unit, + UserFile, UserPreference, ViewLog) from cookbook.templatetags.custom_tags import markdown from recipes.settings import MEDIA_URL @@ -731,11 +731,11 @@ class ShoppingListRecipeSerializer(serializers.ModelSerializer): value = Decimal(value) value = value.quantize(Decimal(1)) if value == value.to_integral() else value.normalize() # strips trailing zero return ( - obj.name - or getattr(obj.mealplan, 'title', None) - or (d := getattr(obj.mealplan, 'date', None)) and ': '.join([obj.mealplan.recipe.name, str(d)]) - or obj.recipe.name - ) + f' ({value:.2g})' + obj.name + or getattr(obj.mealplan, 'title', None) + or (d := getattr(obj.mealplan, 'date', None)) and ': '.join([obj.mealplan.recipe.name, str(d)]) + or obj.recipe.name + ) + f' ({value:.2g})' def update(self, instance, validated_data): # TODO remove once old shopping list