entrouvert
/
authentic
16
0
Fork 0
Code Issues Pull Requests 32 Releases Activity

Revert "clear warnings on missing migrations with Django 1.11 (#34232)" 

This reverts commit 751afd6745.
This commit is contained in:
Benjamin Dauvergne 2019-06-22 20:39:52 +02:00
parent 1dca7e6749
commit 9e9bdc22b9
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/authentic2/a2_rbac/migrations/0001_initial.py
View File

@ -2,7 +2,7 @@
from __future__ import unicode_literals
from django.db import models, migrations
import django_rbac.utils
import authentic2.utils
import authentic2.a2_rbac.fields
from django.conf import settings
@ -21,7 +21,7 @@ class Migration(migrations.Migration):
name='OrganizationalUnit',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('uuid', models.CharField(default=django_rbac.utils.get_hex_uuid, unique=True, max_length=32, verbose_name='uuid')),
('uuid', models.CharField(default=authentic2.utils.get_hex_uuid, unique=True, max_length=32, verbose_name='uuid')),
('name', models.CharField(max_length=256, verbose_name='name')),
('slug', models.SlugField(max_length=256, verbose_name='slug')),
('description', models.TextField(verbose_name='description', blank=True)),
@ -52,7 +52,7 @@ class Migration(migrations.Migration):
name='Role',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('uuid', models.CharField(default=django_rbac.utils.get_hex_uuid, unique=True, max_length=32, verbose_name='uuid')),
('uuid', models.CharField(default=authentic2.utils.get_hex_uuid, unique=True, max_length=32, verbose_name='uuid')),
('name', models.CharField(max_length=256, verbose_name='name')),
('slug', models.SlugField(max_length=256, verbose_name='slug')),
('description', models.TextField(verbose_name='description', blank=True)),

2
src/authentic2/auth_migrations_18/0001_initial.py
View File

@ -18,7 +18,7 @@ class Migration(migrations.Migration):
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('name', models.CharField(max_length=50, verbose_name='name')),
('content_type', models.ForeignKey(to='contenttypes.ContentType', to_field='id', on_delete=models.deletion.CASCADE, verbose_name='content type')),
('content_type', models.ForeignKey(to='contenttypes.ContentType', to_field='id')),
('codename', models.CharField(max_length=100, verbose_name='codename')),
],
options={

2
src/authentic2/auth_migrations_18/0005_auto_20150526_2303.py
View File

@ -54,6 +54,6 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='user',
name='username',
field=models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.ASCIIUsernameValidator()], verbose_name='username'),
field=models.CharField(error_messages={'unique': 'A user with that username already exists.'}, max_length=30, validators=[django.core.validators.RegexValidator('^[\\w.@+-]+$', 'Enter a valid username. This value may contain only letters, numbers and @/./+/-/_ characters.', 'invalid')], help_text='Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only.', unique=True, verbose_name='username'),
),
]

7
src/django_rbac/migrations/0002_organizationalunit_permission_role_roleparenting.py
View File

@ -2,10 +2,9 @@
from __future__ import unicode_literals
from django.db import models, migrations
import authentic2.utils
from django.conf import settings
import django_rbac.utils
class Migration(migrations.Migration):
@ -24,7 +23,7 @@ class Migration(migrations.Migration):
name='OrganizationalUnit',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('uuid', models.CharField(default=django_rbac.utils.get_hex_uuid, unique=True, max_length=32, verbose_name='uuid')),
('uuid', models.CharField(default=authentic2.utils.get_hex_uuid, unique=True, max_length=32, verbose_name='uuid')),
('name', models.CharField(max_length=256, verbose_name='name')),
('slug', models.SlugField(max_length=256, verbose_name='slug')),
('description', models.TextField(verbose_name='description', blank=True)),
@ -56,7 +55,7 @@ class Migration(migrations.Migration):
name='Role',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('uuid', models.CharField(default=django_rbac.utils.get_hex_uuid, unique=True, max_length=32, verbose_name='uuid')),
('uuid', models.CharField(default=authentic2.utils.get_hex_uuid, unique=True, max_length=32, verbose_name='uuid')),
('name', models.CharField(max_length=256, verbose_name='name')),
('slug', models.SlugField(max_length=256, verbose_name='slug')),
('description', models.TextField(verbose_name='description', blank=True)),