diff --git a/ofu_app/apps/food/migrations/0001_initial.py b/ofu_app/apps/food/migrations/0001_initial.py index 85e2fa6..6c030e1 100644 --- a/ofu_app/apps/food/migrations/0001_initial.py +++ b/ofu_app/apps/food/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11.6 on 2017-10-25 21:40 +# Generated by Django 1.11.2 on 2017-10-25 23:47 from __future__ import unicode_literals from django.db import migrations, models @@ -45,9 +45,9 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(primary_key=True, serialize=False)), ('name', models.CharField(max_length=60, unique=True)), - ('price_student', models.CharField(max_length=10)), - ('price_employee', models.CharField(max_length=10)), - ('price_guest', models.CharField(max_length=10)), + ('price_student', models.CharField(blank=True, max_length=10, null=True)), + ('price_employee', models.CharField(blank=True, max_length=10, null=True)), + ('price_guest', models.CharField(blank=True, max_length=10, null=True)), ('image', models.ImageField(blank=True, upload_to='food/%Y/%m/')), ('rating', models.FloatField(default=0)), ('first_star', models.SmallIntegerField(default=0)), @@ -55,7 +55,7 @@ class Migration(migrations.Migration): ('third_star', models.SmallIntegerField(default=0)), ('fourth_star', models.SmallIntegerField(default=0)), ('fifth_star', models.SmallIntegerField(default=0)), - ('allergens', models.ManyToManyField(to='food.Allergene')), + ('allergens', models.ManyToManyField(blank=True, to='food.Allergene')), ], ), migrations.AddField( diff --git a/ofu_app/apps/food/migrations/0002_auto_20171026_0033.py b/ofu_app/apps/food/migrations/0002_auto_20171026_0033.py deleted file mode 100644 index 9bcbe1e..0000000 --- a/ofu_app/apps/food/migrations/0002_auto_20171026_0033.py +++ /dev/null @@ -1,35 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.6 on 2017-10-25 22:33 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('food', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='singlefood', - name='allergens', - field=models.ManyToManyField(blank=True, null=True, to='food.Allergene'), - ), - migrations.AlterField( - model_name='singlefood', - name='price_employee', - field=models.CharField(blank=True, max_length=10, null=True), - ), - migrations.AlterField( - model_name='singlefood', - name='price_guest', - field=models.CharField(blank=True, max_length=10, null=True), - ), - migrations.AlterField( - model_name='singlefood', - name='price_student', - field=models.CharField(blank=True, max_length=10, null=True), - ), - ] diff --git a/ofu_app/apps/food/migrations/0003_auto_20171026_0040.py b/ofu_app/apps/food/migrations/0003_auto_20171026_0040.py deleted file mode 100644 index 0798bf8..0000000 --- a/ofu_app/apps/food/migrations/0003_auto_20171026_0040.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.6 on 2017-10-25 22:40 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('food', '0002_auto_20171026_0033'), - ] - - operations = [ - migrations.AlterField( - model_name='singlefood', - name='allergens', - field=models.ManyToManyField(blank=True, to='food.Allergene'), - ), - ] diff --git a/ofu_app/ofu_app/__pycache__/settings.cpython-35.pyc b/ofu_app/ofu_app/__pycache__/settings.cpython-35.pyc index 52727f1..595ec7f 100644 Binary files a/ofu_app/ofu_app/__pycache__/settings.cpython-35.pyc and b/ofu_app/ofu_app/__pycache__/settings.cpython-35.pyc differ diff --git a/ofu_app/ofu_app/__pycache__/urls.cpython-35.pyc b/ofu_app/ofu_app/__pycache__/urls.cpython-35.pyc index aae6074..500068f 100644 Binary files a/ofu_app/ofu_app/__pycache__/urls.cpython-35.pyc and b/ofu_app/ofu_app/__pycache__/urls.cpython-35.pyc differ diff --git a/ofu_app/templates/food/detailed_food.jinja b/ofu_app/templates/food/detailed_food.jinja index 55579f8..00d1b20 100644 --- a/ofu_app/templates/food/detailed_food.jinja +++ b/ofu_app/templates/food/detailed_food.jinja @@ -5,22 +5,27 @@ {% endblock %} {% block content %}