diff --git a/bikeshop_project/core/migrations/0004_auto_20160405_0354.py b/bikeshop_project/core/migrations/0004_auto_20160405_0354.py new file mode 100644 index 0000000..66807c7 --- /dev/null +++ b/bikeshop_project/core/migrations/0004_auto_20160405_0354.py @@ -0,0 +1,31 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.4 on 2016-04-05 03:54 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0003_visit'), + ] + + operations = [ + migrations.RemoveField( + model_name='membership', + name='acknowledgement', + ), + migrations.RemoveField( + model_name='membership', + name='community', + ), + migrations.RemoveField( + model_name='membership', + name='safe_space', + ), + migrations.RemoveField( + model_name='membership', + name='space', + ), + ] diff --git a/bikeshop_project/core/migrations/0005_merge.py b/bikeshop_project/core/migrations/0005_merge.py new file mode 100644 index 0000000..a65903c --- /dev/null +++ b/bikeshop_project/core/migrations/0005_merge.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.4 on 2016-04-10 18:33 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0004_auto_20160405_0354'), + ('core', '0004_auto_20160410_1816'), + ] + + operations = [ + ] diff --git a/bikeshop_project/core/migrations/0006_auto_20160410_1833.py b/bikeshop_project/core/migrations/0006_auto_20160410_1833.py new file mode 100644 index 0000000..f152ad2 --- /dev/null +++ b/bikeshop_project/core/migrations/0006_auto_20160410_1833.py @@ -0,0 +1,35 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.4 on 2016-04-10 18:33 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0005_merge'), + ] + + operations = [ + migrations.AddField( + model_name='membership', + name='acknowledgement', + field=models.BooleanField(default=False), + ), + migrations.AddField( + model_name='membership', + name='community', + field=models.BooleanField(default=False), + ), + migrations.AddField( + model_name='membership', + name='safe_space', + field=models.BooleanField(default=False), + ), + migrations.AlterField( + model_name='visit', + name='purpose', + field=models.CharField(choices=[('VOLUNTEER', 'volunteer'), ('FIX', 'fix bike'), ('WORKSHOP', 'workshop'), ('VISIT', 'visit'), ('DONATE', 'donate'), ('STAFF', 'staff')], max_length=50), + ), + ] diff --git a/bikeshop_project/core/models.py b/bikeshop_project/core/models.py index 718debc..fb9b364 100644 --- a/bikeshop_project/core/models.py +++ b/bikeshop_project/core/models.py @@ -13,7 +13,6 @@ class Membership(models.Model): ) safe_space = models.BooleanField(default=False) community = models.BooleanField(default=False) - space = models.BooleanField(default=False) give_back = models.BooleanField(default=False) # this should be a form field that requires the new member to type out there full name acknowledgement = models.BooleanField(default=False)