diff --git a/ofu_app/apps/food/migrations/0008_auto_20180201_1018.py b/ofu_app/apps/food/migrations/0008_auto_20180201_1018.py new file mode 100644 index 0000000..83c734b --- /dev/null +++ b/ofu_app/apps/food/migrations/0008_auto_20180201_1018.py @@ -0,0 +1,18 @@ +# Generated by Django 2.0.1 on 2018-02-01 10:18 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('food', '0007_auto_20180117_0137'), + ] + + operations = [ + migrations.AlterField( + model_name='singlefood', + name='allergens', + field=models.ManyToManyField(blank=True, to='food.Allergene'), + ), + ] diff --git a/ofu_app/apps/registration/views.py b/ofu_app/apps/registration/views.py index c735337..858803f 100644 --- a/ofu_app/apps/registration/views.py +++ b/ofu_app/apps/registration/views.py @@ -60,11 +60,12 @@ def account_activation_sent(request): def account_view(request): + print("There it is ---------------------------------------------------------------------") if request.user.is_authenticated: user = request.user food_ratings = UserRating.objects.filter(user=user).order_by('food__name') - food_images = UserFoodImage.objects.filter(user=user) + food_images = UserFoodImage.objects.filter(user=user.id) print(food_images) return render(request, 'registration/account_view.jinja', diff --git a/ofu_app/templates/macros/food_macros.jinja b/ofu_app/templates/macros/food_macros.jinja index e596b5c..ae08689 100644 --- a/ofu_app/templates/macros/food_macros.jinja +++ b/ofu_app/templates/macros/food_macros.jinja @@ -63,7 +63,7 @@ {% if single_food.image %} - Bild + Bild {% else %}

{{ image.food.name }}

- - Lights + + Lights