From 0a42233e58ee4418d92c01db182a2f4d5d06e33f Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Fri, 3 Jul 2015 01:15:07 -0400 Subject: [PATCH] Fix ACL app migrations. --- mayan/apps/acls/migrations/0001_initial.py | 4 +- .../migrations/0002_auto_20150629_1852.py | 47 ------------------- ...630_0442.py => 0002_auto_20150703_0513.py} | 41 ++++++++++++++-- .../migrations/0004_auto_20150630_0544.py | 18 ------- 4 files changed, 38 insertions(+), 72 deletions(-) delete mode 100644 mayan/apps/acls/migrations/0002_auto_20150629_1852.py rename mayan/apps/acls/migrations/{0003_auto_20150630_0442.py => 0002_auto_20150703_0513.py} (52%) delete mode 100644 mayan/apps/acls/migrations/0004_auto_20150630_0544.py diff --git a/mayan/apps/acls/migrations/0001_initial.py b/mayan/apps/acls/migrations/0001_initial.py index 84ee0bd39b..3fc1e6190f 100644 --- a/mayan/apps/acls/migrations/0001_initial.py +++ b/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()), diff --git a/mayan/apps/acls/migrations/0002_auto_20150629_1852.py b/mayan/apps/acls/migrations/0002_auto_20150629_1852.py deleted file mode 100644 index 7e983682c9..0000000000 --- a/mayan/apps/acls/migrations/0002_auto_20150629_1852.py +++ /dev/null @@ -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, - ), - ] diff --git a/mayan/apps/acls/migrations/0003_auto_20150630_0442.py b/mayan/apps/acls/migrations/0002_auto_20150703_0513.py similarity index 52% rename from mayan/apps/acls/migrations/0003_auto_20150630_0442.py rename to mayan/apps/acls/migrations/0002_auto_20150703_0513.py index d7293e3f82..0592d6e65c 100644 --- a/mayan/apps/acls/migrations/0003_auto_20150630_0442.py +++ b/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')]), ), ] diff --git a/mayan/apps/acls/migrations/0004_auto_20150630_0544.py b/mayan/apps/acls/migrations/0004_auto_20150630_0544.py deleted file mode 100644 index f17a6841fc..0000000000 --- a/mayan/apps/acls/migrations/0004_auto_20150630_0544.py +++ /dev/null @@ -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')]), - ), - ]