Fix ACL app migrations.

mayan/apps/acls/migrations/0001_initial.py

@@ -13,7 +13,7 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.CreateModel(
-            name='AccessControlList',
+            name='AccessEntry',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('holder_id', models.PositiveIntegerField()),
@@ -40,7 +40,7 @@ class Migration(migrations.Migration):
             bases=(models.Model,),
         ),
         migrations.CreateModel(
-            name='DefaultAccessControlList',
+            name='DefaultAccessEntry',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('holder_id', models.PositiveIntegerField()),

mayan/apps/acls/migrations/0002_auto_20150629_1852.py

@@ -1,47 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('permissions', '0002_auto_20150628_0533'),
-        ('acls', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.DeleteModel(
-            name='CreatorSingleton',
-        ),
-        migrations.RemoveField(
-            model_name='defaultaccessentry',
-            name='content_type',
-        ),
-        migrations.RemoveField(
-            model_name='defaultaccessentry',
-            name='holder_type',
-        ),
-        migrations.RemoveField(
-            model_name='defaultaccessentry',
-            name='permission',
-        ),
-        migrations.DeleteModel(
-            name='DefaultAccessControlList',
-        ),
-        migrations.RemoveField(
-            model_name='accessentry',
-            name='holder_id',
-        ),
-        migrations.RemoveField(
-            model_name='accessentry',
-            name='holder_type',
-        ),
-        migrations.AddField(
-            model_name='accessentry',
-            name='role',
-            field=models.ForeignKey(default=1, verbose_name='Role', to='permissions.Role'),
-            preserve_default=False,
-        ),
-    ]

mayan/apps/acls/migrations/0002_auto_20150703_0513.py

@@ -9,7 +9,7 @@ class Migration(migrations.Migration):
     dependencies = [
         ('contenttypes', '0001_initial'),
         ('permissions', '0002_auto_20150628_0533'),
-        ('acls', '0002_auto_20150629_1852'),
+        ('acls', '0001_initial'),
     ]
 
     operations = [
@@ -19,7 +19,7 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('object_id', models.PositiveIntegerField()),
                 ('content_type', models.ForeignKey(related_name='object_content_type', to='contenttypes.ContentType')),
-                ('permissions', models.ManyToManyField(related_name='acls', verbose_name='Permissions', to='permissions.StoredPermission')),
+                ('permissions', models.ManyToManyField(related_name='acls', verbose_name='Permissions', to='permissions.StoredPermission', blank=True)),
                 ('role', models.ForeignKey(related_name='acls', verbose_name='Role', to='permissions.Role')),
             ],
             options={
@@ -28,10 +28,41 @@ class Migration(migrations.Migration):
             },
             bases=(models.Model,),
         ),
-        migrations.AlterField(
+        migrations.RemoveField(
             model_name='accessentry',
             name='content_type',
-            field=models.ForeignKey(related_name='object_content_type_1', to='contenttypes.ContentType'),
+        ),
-            preserve_default=True,
+        migrations.RemoveField(
+            model_name='accessentry',
+            name='holder_type',
+        ),
+        migrations.RemoveField(
+            model_name='accessentry',
+            name='permission',
+        ),
+        migrations.DeleteModel(
+            name='AccessEntry',
+        ),
+        migrations.DeleteModel(
+            name='CreatorSingleton',
+        ),
+        migrations.RemoveField(
+            model_name='defaultaccessentry',
+            name='content_type',
+        ),
+        migrations.RemoveField(
+            model_name='defaultaccessentry',
+            name='holder_type',
+        ),
+        migrations.RemoveField(
+            model_name='defaultaccessentry',
+            name='permission',
+        ),
+        migrations.DeleteModel(
+            name='DefaultAccessEntry',
+        ),
+        migrations.AlterUniqueTogether(
+            name='accesscontrollist',
+            unique_together=set([('content_type', 'object_id', 'role')]),
         ),
     ]

mayan/apps/acls/migrations/0004_auto_20150630_0544.py

@@ -1,18 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('acls', '0003_auto_20150630_0442'),
-    ]
-
-    operations = [
-        migrations.AlterUniqueTogether(
-            name='accesscontrollist',
-            unique_together=set([('content_type', 'object_id', 'role')]),
-        ),
-    ]