squash simple models migrations

pinax · Jul 3, 2016 · 5475ea5 · 5475ea5
1 parent 205d98a
commit 5475ea5
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 86 deletions.
diff --git a/...ams/migrations/0003_auto_20160309_1717.py → ...eams/migrations/0002_add_simple_models.py b/...ams/migrations/0003_auto_20160309_1717.py → ...eams/migrations/0002_add_simple_models.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.9.1 on 2016-03-09 22:17
+# Generated by Django 1.9.7 on 2016-07-03 21:40
 from __future__ import unicode_literals
 
 from django.conf import settings
@@ -11,37 +11,42 @@
 class Migration(migrations.Migration):
 
     dependencies = [
+        ('invitations', '0001_initial'),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('pinax_teams', '0002_auto_20160309_1536'),
+        ('pinax_teams', '0001_initial'),
     ]
 
     operations = [
         migrations.CreateModel(
             name='SimpleMembership',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('state', models.CharField(choices=[('applied', 'applied'), ('invited', 'invited'), ('declined', 'declined'), ('rejected', 'rejected'), ('accepted', 'accepted'), ('auto-joined', 'auto joined')], max_length=20, verbose_name='state')),
-                ('role', models.CharField(choices=[('member', 'member'), ('manager', 'manager'), ('owner', 'owner')], default='member', max_length=20, verbose_name='role')),
+                ('state', models.CharField(choices=[(b'applied', 'applied'), (b'invited', 'invited'), (b'declined', 'declined'), (b'rejected', 'rejected'), (b'accepted', 'accepted'), (b'auto-joined', 'auto joined')], max_length=20, verbose_name='state')),
+                ('role', models.CharField(choices=[(b'member', 'member'), (b'manager', 'manager'), (b'owner', 'owner')], default=b'member', max_length=20, verbose_name='role')),
                 ('created', models.DateTimeField(default=django.utils.timezone.now, verbose_name='created')),
-                ('invite', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='memberships', to='invitations.JoinInvitation', verbose_name='invite')),
+                ('invite', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='simple_memberships', to='invitations.JoinInvitation', verbose_name='invite')),
             ],
             options={
                 'verbose_name': 'Simple Membership',
                 'verbose_name_plural': 'Simple Memberships',
             },
         ),
-        migrations.RenameModel(
-            old_name='Role',
-            new_name='SimpleTeam',
+        migrations.CreateModel(
+            name='SimpleTeam',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('member_access', models.CharField(choices=[(b'open', 'open'), (b'application', 'by application'), (b'invitation', 'by invitation')], max_length=20, verbose_name='member access')),
+                ('manager_access', models.CharField(choices=[(b'add someone', 'add someone'), (b'invite someone', 'invite someone')], max_length=20, verbose_name='manager access')),
+            ],
+            options={
+                'verbose_name': 'Simple Team',
+                'verbose_name_plural': 'Simple Teams',
+            },
         ),
         migrations.AlterModelOptions(
             name='membership',
             options={'verbose_name': 'Membership', 'verbose_name_plural': 'Memberships'},
         ),
-        migrations.AlterModelOptions(
-            name='simpleteam',
-            options={'verbose_name': 'Simple Team', 'verbose_name_plural': 'Simple Teams'},
-        ),
         migrations.AddField(
             model_name='simplemembership',
             name='team',
@@ -50,7 +55,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='simplemembership',
             name='user',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='memberships', to=settings.AUTH_USER_MODEL, verbose_name='user'),
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='simple_memberships', to=settings.AUTH_USER_MODEL, verbose_name='user'),
         ),
         migrations.AlterUniqueTogether(
             name='simplemembership',

diff --git a/pinax/teams/migrations/0002_auto_20160309_1536.py b/pinax/teams/migrations/0002_auto_20160309_1536.py
diff --git a/pinax/teams/migrations/0004_auto_20160310_1007.py b/pinax/teams/migrations/0004_auto_20160310_1007.py