测试gitnore
This commit is contained in:
ladeng07
@@ -7,199 +7,98 @@ from django.utils import timezone
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
("contenttypes", "__first__"),
|
||||
('contenttypes', '__first__'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name="Permission",
|
||||
name='Permission',
|
||||
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",
|
||||
on_delete=models.CASCADE,
|
||||
verbose_name="content type",
|
||||
),
|
||||
),
|
||||
("codename", models.CharField(max_length=100, verbose_name="codename")),
|
||||
('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',
|
||||
on_delete=models.CASCADE,
|
||||
to_field='id',
|
||||
verbose_name='content type',
|
||||
)),
|
||||
('codename', models.CharField(max_length=100, verbose_name='codename')),
|
||||
],
|
||||
options={
|
||||
"ordering": [
|
||||
"content_type__app_label",
|
||||
"content_type__model",
|
||||
"codename",
|
||||
],
|
||||
"unique_together": {("content_type", "codename")},
|
||||
"verbose_name": "permission",
|
||||
"verbose_name_plural": "permissions",
|
||||
'ordering': ['content_type__app_label', 'content_type__model', 'codename'],
|
||||
'unique_together': {('content_type', 'codename')},
|
||||
'verbose_name': 'permission',
|
||||
'verbose_name_plural': 'permissions',
|
||||
},
|
||||
managers=[
|
||||
("objects", django.contrib.auth.models.PermissionManager()),
|
||||
('objects', django.contrib.auth.models.PermissionManager()),
|
||||
],
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name="Group",
|
||||
name='Group',
|
||||
fields=[
|
||||
(
|
||||
"id",
|
||||
models.AutoField(
|
||||
verbose_name="ID",
|
||||
serialize=False,
|
||||
auto_created=True,
|
||||
primary_key=True,
|
||||
),
|
||||
),
|
||||
(
|
||||
"name",
|
||||
models.CharField(unique=True, max_length=80, verbose_name="name"),
|
||||
),
|
||||
(
|
||||
"permissions",
|
||||
models.ManyToManyField(
|
||||
to="auth.Permission", verbose_name="permissions", blank=True
|
||||
),
|
||||
),
|
||||
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
|
||||
('name', models.CharField(unique=True, max_length=80, verbose_name='name')),
|
||||
('permissions', models.ManyToManyField(to='auth.Permission', verbose_name='permissions', blank=True)),
|
||||
],
|
||||
options={
|
||||
"verbose_name": "group",
|
||||
"verbose_name_plural": "groups",
|
||||
'verbose_name': 'group',
|
||||
'verbose_name_plural': 'groups',
|
||||
},
|
||||
managers=[
|
||||
("objects", django.contrib.auth.models.GroupManager()),
|
||||
('objects', django.contrib.auth.models.GroupManager()),
|
||||
],
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name="User",
|
||||
name='User',
|
||||
fields=[
|
||||
(
|
||||
"id",
|
||||
models.AutoField(
|
||||
verbose_name="ID",
|
||||
serialize=False,
|
||||
auto_created=True,
|
||||
primary_key=True,
|
||||
),
|
||||
),
|
||||
("password", models.CharField(max_length=128, verbose_name="password")),
|
||||
(
|
||||
"last_login",
|
||||
models.DateTimeField(
|
||||
default=timezone.now, verbose_name="last login"
|
||||
),
|
||||
),
|
||||
(
|
||||
"is_superuser",
|
||||
models.BooleanField(
|
||||
default=False,
|
||||
help_text=(
|
||||
"Designates that this user has all permissions without "
|
||||
"explicitly assigning them."
|
||||
),
|
||||
verbose_name="superuser status",
|
||||
),
|
||||
),
|
||||
(
|
||||
"username",
|
||||
models.CharField(
|
||||
help_text=(
|
||||
"Required. 30 characters or fewer. Letters, digits and "
|
||||
"@/./+/-/_ only."
|
||||
),
|
||||
unique=True,
|
||||
max_length=30,
|
||||
verbose_name="username",
|
||||
validators=[validators.UnicodeUsernameValidator()],
|
||||
),
|
||||
),
|
||||
(
|
||||
"first_name",
|
||||
models.CharField(
|
||||
max_length=30, verbose_name="first name", blank=True
|
||||
),
|
||||
),
|
||||
(
|
||||
"last_name",
|
||||
models.CharField(
|
||||
max_length=30, verbose_name="last name", blank=True
|
||||
),
|
||||
),
|
||||
(
|
||||
"email",
|
||||
models.EmailField(
|
||||
max_length=75, verbose_name="email address", blank=True
|
||||
),
|
||||
),
|
||||
(
|
||||
"is_staff",
|
||||
models.BooleanField(
|
||||
default=False,
|
||||
help_text=(
|
||||
"Designates whether the user can log into this admin site."
|
||||
),
|
||||
verbose_name="staff status",
|
||||
),
|
||||
),
|
||||
(
|
||||
"is_active",
|
||||
models.BooleanField(
|
||||
default=True,
|
||||
verbose_name="active",
|
||||
help_text=(
|
||||
"Designates whether this user should be treated as active. "
|
||||
"Unselect this instead of deleting accounts."
|
||||
),
|
||||
),
|
||||
),
|
||||
(
|
||||
"date_joined",
|
||||
models.DateTimeField(
|
||||
default=timezone.now, verbose_name="date joined"
|
||||
),
|
||||
),
|
||||
(
|
||||
"groups",
|
||||
models.ManyToManyField(
|
||||
to="auth.Group",
|
||||
verbose_name="groups",
|
||||
blank=True,
|
||||
related_name="user_set",
|
||||
related_query_name="user",
|
||||
help_text=(
|
||||
"The groups this user belongs to. A user will get all "
|
||||
"permissions granted to each of their groups."
|
||||
),
|
||||
),
|
||||
),
|
||||
(
|
||||
"user_permissions",
|
||||
models.ManyToManyField(
|
||||
to="auth.Permission",
|
||||
verbose_name="user permissions",
|
||||
blank=True,
|
||||
help_text="Specific permissions for this user.",
|
||||
related_name="user_set",
|
||||
related_query_name="user",
|
||||
),
|
||||
),
|
||||
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
|
||||
('password', models.CharField(max_length=128, verbose_name='password')),
|
||||
('last_login', models.DateTimeField(default=timezone.now, verbose_name='last login')),
|
||||
('is_superuser', models.BooleanField(
|
||||
default=False,
|
||||
help_text='Designates that this user has all permissions without explicitly assigning them.',
|
||||
verbose_name='superuser status'
|
||||
)),
|
||||
('username', models.CharField(
|
||||
help_text='Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only.', unique=True,
|
||||
max_length=30, verbose_name='username',
|
||||
validators=[validators.UnicodeUsernameValidator()],
|
||||
)),
|
||||
('first_name', models.CharField(max_length=30, verbose_name='first name', blank=True)),
|
||||
('last_name', models.CharField(max_length=30, verbose_name='last name', blank=True)),
|
||||
('email', models.EmailField(max_length=75, verbose_name='email address', blank=True)),
|
||||
('is_staff', models.BooleanField(
|
||||
default=False, help_text='Designates whether the user can log into this admin site.',
|
||||
verbose_name='staff status'
|
||||
)),
|
||||
('is_active', models.BooleanField(
|
||||
default=True, verbose_name='active', help_text=(
|
||||
'Designates whether this user should be treated as active. Unselect this instead of deleting '
|
||||
'accounts.'
|
||||
)
|
||||
)),
|
||||
('date_joined', models.DateTimeField(default=timezone.now, verbose_name='date joined')),
|
||||
('groups', models.ManyToManyField(
|
||||
to='auth.Group', verbose_name='groups', blank=True, related_name='user_set',
|
||||
related_query_name='user', help_text=(
|
||||
'The groups this user belongs to. A user will get all permissions granted to each of their '
|
||||
'groups.'
|
||||
)
|
||||
)),
|
||||
('user_permissions', models.ManyToManyField(
|
||||
to='auth.Permission', verbose_name='user permissions', blank=True,
|
||||
help_text='Specific permissions for this user.', related_name='user_set',
|
||||
related_query_name='user')
|
||||
),
|
||||
],
|
||||
options={
|
||||
"swappable": "AUTH_USER_MODEL",
|
||||
"verbose_name": "user",
|
||||
"verbose_name_plural": "users",
|
||||
'swappable': 'AUTH_USER_MODEL',
|
||||
'verbose_name': 'user',
|
||||
'verbose_name_plural': 'users',
|
||||
},
|
||||
managers=[
|
||||
("objects", django.contrib.auth.models.UserManager()),
|
||||
('objects', django.contrib.auth.models.UserManager()),
|
||||
],
|
||||
),
|
||||
]
|
||||
|
||||
+4
-4
@@ -4,13 +4,13 @@ from django.db import migrations, models
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
("auth", "0001_initial"),
|
||||
('auth', '0001_initial'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name="permission",
|
||||
name="name",
|
||||
field=models.CharField(max_length=255, verbose_name="name"),
|
||||
model_name='permission',
|
||||
name='name',
|
||||
field=models.CharField(max_length=255, verbose_name='name'),
|
||||
),
|
||||
]
|
||||
|
||||
+4
-6
@@ -4,15 +4,13 @@ from django.db import migrations, models
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
("auth", "0002_alter_permission_name_max_length"),
|
||||
('auth', '0002_alter_permission_name_max_length'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name="user",
|
||||
name="email",
|
||||
field=models.EmailField(
|
||||
max_length=254, verbose_name="email address", blank=True
|
||||
),
|
||||
model_name='user',
|
||||
name='email',
|
||||
field=models.EmailField(max_length=254, verbose_name='email address', blank=True),
|
||||
),
|
||||
]
|
||||
|
||||
+6
-11
@@ -5,24 +5,19 @@ from django.db import migrations, models
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
("auth", "0003_alter_user_email_max_length"),
|
||||
('auth', '0003_alter_user_email_max_length'),
|
||||
]
|
||||
|
||||
# No database changes; modifies validators and error_messages (#13147).
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name="user",
|
||||
name="username",
|
||||
model_name='user',
|
||||
name='username',
|
||||
field=models.CharField(
|
||||
error_messages={"unique": "A user with that username already exists."},
|
||||
max_length=30,
|
||||
error_messages={'unique': 'A user with that username already exists.'}, max_length=30,
|
||||
validators=[validators.UnicodeUsernameValidator()],
|
||||
help_text=(
|
||||
"Required. 30 characters or fewer. Letters, digits and @/./+/-/_ "
|
||||
"only."
|
||||
),
|
||||
unique=True,
|
||||
verbose_name="username",
|
||||
help_text='Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only.',
|
||||
unique=True, verbose_name='username'
|
||||
),
|
||||
),
|
||||
]
|
||||
|
||||
+4
-6
@@ -4,15 +4,13 @@ from django.db import migrations, models
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
("auth", "0004_alter_user_username_opts"),
|
||||
('auth', '0004_alter_user_username_opts'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name="user",
|
||||
name="last_login",
|
||||
field=models.DateTimeField(
|
||||
null=True, verbose_name="last login", blank=True
|
||||
),
|
||||
model_name='user',
|
||||
name='last_login',
|
||||
field=models.DateTimeField(null=True, verbose_name='last login', blank=True),
|
||||
),
|
||||
]
|
||||
|
||||
+2
-2
@@ -4,8 +4,8 @@ from django.db import migrations
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
("auth", "0005_alter_user_last_login_null"),
|
||||
("contenttypes", "0002_remove_content_type_name"),
|
||||
('auth', '0005_alter_user_last_login_null'),
|
||||
('contenttypes', '0002_remove_content_type_name'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
|
||||
+6
-9
@@ -5,23 +5,20 @@ from django.db import migrations, models
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
("auth", "0006_require_contenttypes_0002"),
|
||||
('auth', '0006_require_contenttypes_0002'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name="user",
|
||||
name="username",
|
||||
model_name='user',
|
||||
name='username',
|
||||
field=models.CharField(
|
||||
error_messages={"unique": "A user with that username already exists."},
|
||||
help_text=(
|
||||
"Required. 30 characters or fewer. Letters, digits and @/./+/-/_ "
|
||||
"only."
|
||||
),
|
||||
error_messages={'unique': 'A user with that username already exists.'},
|
||||
help_text='Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only.',
|
||||
max_length=30,
|
||||
unique=True,
|
||||
validators=[validators.UnicodeUsernameValidator()],
|
||||
verbose_name="username",
|
||||
verbose_name='username',
|
||||
),
|
||||
),
|
||||
]
|
||||
|
||||
+6
-9
@@ -5,23 +5,20 @@ from django.db import migrations, models
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
("auth", "0007_alter_validators_add_error_messages"),
|
||||
('auth', '0007_alter_validators_add_error_messages'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name="user",
|
||||
name="username",
|
||||
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."
|
||||
),
|
||||
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=[validators.UnicodeUsernameValidator()],
|
||||
verbose_name="username",
|
||||
verbose_name='username',
|
||||
),
|
||||
),
|
||||
]
|
||||
|
||||
+4
-6
@@ -4,15 +4,13 @@ from django.db import migrations, models
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
("auth", "0008_alter_user_username_max_length"),
|
||||
('auth', '0008_alter_user_username_max_length'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name="user",
|
||||
name="last_name",
|
||||
field=models.CharField(
|
||||
blank=True, max_length=150, verbose_name="last name"
|
||||
),
|
||||
model_name='user',
|
||||
name='last_name',
|
||||
field=models.CharField(blank=True, max_length=150, verbose_name='last name'),
|
||||
),
|
||||
]
|
||||
|
||||
+4
-4
@@ -4,13 +4,13 @@ from django.db import migrations, models
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
("auth", "0009_alter_user_last_name_max_length"),
|
||||
('auth', '0009_alter_user_last_name_max_length'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name="group",
|
||||
name="name",
|
||||
field=models.CharField(max_length=150, unique=True, verbose_name="name"),
|
||||
model_name='group',
|
||||
name='name',
|
||||
field=models.CharField(max_length=150, unique=True, verbose_name='name'),
|
||||
),
|
||||
]
|
||||
|
||||
+12
-19
@@ -20,26 +20,23 @@ def update_proxy_model_permissions(apps, schema_editor, reverse=False):
|
||||
of the proxy model.
|
||||
"""
|
||||
style = color_style()
|
||||
Permission = apps.get_model("auth", "Permission")
|
||||
ContentType = apps.get_model("contenttypes", "ContentType")
|
||||
Permission = apps.get_model('auth', 'Permission')
|
||||
ContentType = apps.get_model('contenttypes', 'ContentType')
|
||||
alias = schema_editor.connection.alias
|
||||
for Model in apps.get_models():
|
||||
opts = Model._meta
|
||||
if not opts.proxy:
|
||||
continue
|
||||
proxy_default_permissions_codenames = [
|
||||
"%s_%s" % (action, opts.model_name) for action in opts.default_permissions
|
||||
'%s_%s' % (action, opts.model_name)
|
||||
for action in opts.default_permissions
|
||||
]
|
||||
permissions_query = Q(codename__in=proxy_default_permissions_codenames)
|
||||
for codename, name in opts.permissions:
|
||||
permissions_query = permissions_query | Q(codename=codename, name=name)
|
||||
content_type_manager = ContentType.objects.db_manager(alias)
|
||||
concrete_content_type = content_type_manager.get_for_model(
|
||||
Model, for_concrete_model=True
|
||||
)
|
||||
proxy_content_type = content_type_manager.get_for_model(
|
||||
Model, for_concrete_model=False
|
||||
)
|
||||
concrete_content_type = content_type_manager.get_for_model(Model, for_concrete_model=True)
|
||||
proxy_content_type = content_type_manager.get_for_model(Model, for_concrete_model=False)
|
||||
old_content_type = proxy_content_type if reverse else concrete_content_type
|
||||
new_content_type = concrete_content_type if reverse else proxy_content_type
|
||||
try:
|
||||
@@ -49,11 +46,9 @@ def update_proxy_model_permissions(apps, schema_editor, reverse=False):
|
||||
content_type=old_content_type,
|
||||
).update(content_type=new_content_type)
|
||||
except IntegrityError:
|
||||
old = "{}_{}".format(old_content_type.app_label, old_content_type.model)
|
||||
new = "{}_{}".format(new_content_type.app_label, new_content_type.model)
|
||||
sys.stdout.write(
|
||||
style.WARNING(WARNING.format(old=old, new=new, query=permissions_query))
|
||||
)
|
||||
old = '{}_{}'.format(old_content_type.app_label, old_content_type.model)
|
||||
new = '{}_{}'.format(new_content_type.app_label, new_content_type.model)
|
||||
sys.stdout.write(style.WARNING(WARNING.format(old=old, new=new, query=permissions_query)))
|
||||
|
||||
|
||||
def revert_proxy_model_permissions(apps, schema_editor):
|
||||
@@ -66,11 +61,9 @@ def revert_proxy_model_permissions(apps, schema_editor):
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
dependencies = [
|
||||
("auth", "0010_alter_group_name_max_length"),
|
||||
("contenttypes", "0002_remove_content_type_name"),
|
||||
('auth', '0010_alter_group_name_max_length'),
|
||||
('contenttypes', '0002_remove_content_type_name'),
|
||||
]
|
||||
operations = [
|
||||
migrations.RunPython(
|
||||
update_proxy_model_permissions, revert_proxy_model_permissions
|
||||
),
|
||||
migrations.RunPython(update_proxy_model_permissions, revert_proxy_model_permissions),
|
||||
]
|
||||
|
||||
+4
-6
@@ -4,15 +4,13 @@ from django.db import migrations, models
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
("auth", "0011_update_proxy_permissions"),
|
||||
('auth', '0011_update_proxy_permissions'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name="user",
|
||||
name="first_name",
|
||||
field=models.CharField(
|
||||
blank=True, max_length=150, verbose_name="first name"
|
||||
),
|
||||
model_name='user',
|
||||
name='first_name',
|
||||
field=models.CharField(blank=True, max_length=150, verbose_name='first name'),
|
||||
),
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user