added ingredient merging to shopping list

This commit is contained in:
vabene1111
2021-01-25 17:24:03 +01:00
parent 9fd87dbf23
commit a16ad2c887
7 changed files with 131 additions and 59 deletions

View File

@@ -5,7 +5,7 @@ from .models import (Comment, CookLog, Food, Ingredient, InviteLink, Keyword,
RecipeBook, RecipeBookEntry, RecipeImport, ShareLink,
ShoppingList, ShoppingListEntry, ShoppingListRecipe,
Space, Step, Storage, Sync, SyncLog, Unit, UserPreference,
ViewLog)
ViewLog, Supermarket, SupermarketCategory)
class SpaceAdmin(admin.ModelAdmin):
@@ -42,6 +42,9 @@ class SyncAdmin(admin.ModelAdmin):
admin.site.register(Sync, SyncAdmin)
admin.site.register(Supermarket)
admin.site.register(SupermarketCategory)
class SyncLogAdmin(admin.ModelAdmin):
list_display = ('sync', 'status', 'msg', 'created_at')