mirror of
https://github.com/ae-utbm/sith.git
synced 2025-07-10 03:49:24 +00:00
All: Apply Black coding rules
This commit is contained in:
@ -7,28 +7,92 @@ import django.core.validators
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
]
|
||||
dependencies = []
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='Club',
|
||||
name="Club",
|
||||
fields=[
|
||||
('id', models.AutoField(primary_key=True, serialize=False, verbose_name='ID', auto_created=True)),
|
||||
('name', models.CharField(max_length=64, verbose_name='name')),
|
||||
('unix_name', models.CharField(unique=True, max_length=30, error_messages={'unique': 'A club with that unix name already exists.'}, verbose_name='unix name', validators=[django.core.validators.RegexValidator('^[a-z0-9][a-z0-9._-]*[a-z0-9]$', 'Enter a valid unix name. This value may contain only letters, numbers ./-/_ characters.')])),
|
||||
('address', models.CharField(max_length=254, verbose_name='address')),
|
||||
(
|
||||
"id",
|
||||
models.AutoField(
|
||||
primary_key=True,
|
||||
serialize=False,
|
||||
verbose_name="ID",
|
||||
auto_created=True,
|
||||
),
|
||||
),
|
||||
("name", models.CharField(max_length=64, verbose_name="name")),
|
||||
(
|
||||
"unix_name",
|
||||
models.CharField(
|
||||
unique=True,
|
||||
max_length=30,
|
||||
error_messages={
|
||||
"unique": "A club with that unix name already exists."
|
||||
},
|
||||
verbose_name="unix name",
|
||||
validators=[
|
||||
django.core.validators.RegexValidator(
|
||||
"^[a-z0-9][a-z0-9._-]*[a-z0-9]$",
|
||||
"Enter a valid unix name. This value may contain only letters, numbers ./-/_ characters.",
|
||||
)
|
||||
],
|
||||
),
|
||||
),
|
||||
("address", models.CharField(max_length=254, verbose_name="address")),
|
||||
],
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='Membership',
|
||||
name="Membership",
|
||||
fields=[
|
||||
('id', models.AutoField(primary_key=True, serialize=False, verbose_name='ID', auto_created=True)),
|
||||
('start_date', models.DateField(verbose_name='start date', auto_now=True)),
|
||||
('end_date', models.DateField(null=True, verbose_name='end date', blank=True)),
|
||||
('role', models.IntegerField(choices=[(0, 'Curious'), (1, 'Active member'), (2, 'Board member'), (3, 'IT supervisor'), (4, 'Secretary'), (5, 'Communication supervisor'), (7, 'Treasurer'), (9, 'Vice-President'), (10, 'President')], default=0, verbose_name='role')),
|
||||
('description', models.CharField(max_length=128, blank=True, verbose_name='description')),
|
||||
('club', models.ForeignKey(verbose_name='club', to='club.Club', related_name='members')),
|
||||
(
|
||||
"id",
|
||||
models.AutoField(
|
||||
primary_key=True,
|
||||
serialize=False,
|
||||
verbose_name="ID",
|
||||
auto_created=True,
|
||||
),
|
||||
),
|
||||
(
|
||||
"start_date",
|
||||
models.DateField(verbose_name="start date", auto_now=True),
|
||||
),
|
||||
(
|
||||
"end_date",
|
||||
models.DateField(null=True, verbose_name="end date", blank=True),
|
||||
),
|
||||
(
|
||||
"role",
|
||||
models.IntegerField(
|
||||
choices=[
|
||||
(0, "Curious"),
|
||||
(1, "Active member"),
|
||||
(2, "Board member"),
|
||||
(3, "IT supervisor"),
|
||||
(4, "Secretary"),
|
||||
(5, "Communication supervisor"),
|
||||
(7, "Treasurer"),
|
||||
(9, "Vice-President"),
|
||||
(10, "President"),
|
||||
],
|
||||
default=0,
|
||||
verbose_name="role",
|
||||
),
|
||||
),
|
||||
(
|
||||
"description",
|
||||
models.CharField(
|
||||
max_length=128, blank=True, verbose_name="description"
|
||||
),
|
||||
),
|
||||
(
|
||||
"club",
|
||||
models.ForeignKey(
|
||||
verbose_name="club", to="club.Club", related_name="members"
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
]
|
||||
|
||||
@ -9,39 +9,57 @@ class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||
('club', '0001_initial'),
|
||||
('core', '0001_initial'),
|
||||
("club", "0001_initial"),
|
||||
("core", "0001_initial"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='membership',
|
||||
name='user',
|
||||
field=models.ForeignKey(verbose_name='user', to=settings.AUTH_USER_MODEL, related_name='membership'),
|
||||
model_name="membership",
|
||||
name="user",
|
||||
field=models.ForeignKey(
|
||||
verbose_name="user",
|
||||
to=settings.AUTH_USER_MODEL,
|
||||
related_name="membership",
|
||||
),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='club',
|
||||
name='edit_groups',
|
||||
field=models.ManyToManyField(to='core.Group', blank=True, related_name='editable_club'),
|
||||
model_name="club",
|
||||
name="edit_groups",
|
||||
field=models.ManyToManyField(
|
||||
to="core.Group", blank=True, related_name="editable_club"
|
||||
),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='club',
|
||||
name='home',
|
||||
field=models.OneToOneField(blank=True, null=True, related_name='home_of_club', verbose_name='home', to='core.SithFile'),
|
||||
model_name="club",
|
||||
name="home",
|
||||
field=models.OneToOneField(
|
||||
blank=True,
|
||||
null=True,
|
||||
related_name="home_of_club",
|
||||
verbose_name="home",
|
||||
to="core.SithFile",
|
||||
),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='club',
|
||||
name='owner_group',
|
||||
field=models.ForeignKey(default=1, to='core.Group', related_name='owned_club'),
|
||||
model_name="club",
|
||||
name="owner_group",
|
||||
field=models.ForeignKey(
|
||||
default=1, to="core.Group", related_name="owned_club"
|
||||
),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='club',
|
||||
name='parent',
|
||||
field=models.ForeignKey(null=True, to='club.Club', related_name='children', blank=True),
|
||||
model_name="club",
|
||||
name="parent",
|
||||
field=models.ForeignKey(
|
||||
null=True, to="club.Club", related_name="children", blank=True
|
||||
),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='club',
|
||||
name='view_groups',
|
||||
field=models.ManyToManyField(to='core.Group', blank=True, related_name='viewable_club'),
|
||||
model_name="club",
|
||||
name="view_groups",
|
||||
field=models.ManyToManyField(
|
||||
to="core.Group", blank=True, related_name="viewable_club"
|
||||
),
|
||||
),
|
||||
]
|
||||
|
||||
@ -6,14 +6,12 @@ from django.db import migrations, models
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('club', '0002_auto_20160824_2152'),
|
||||
]
|
||||
dependencies = [("club", "0002_auto_20160824_2152")]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='membership',
|
||||
name='start_date',
|
||||
field=models.DateField(verbose_name='start date'),
|
||||
),
|
||||
model_name="membership",
|
||||
name="start_date",
|
||||
field=models.DateField(verbose_name="start date"),
|
||||
)
|
||||
]
|
||||
|
||||
@ -7,14 +7,16 @@ from django.conf import settings
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('club', '0003_auto_20160902_2042'),
|
||||
]
|
||||
dependencies = [("club", "0003_auto_20160902_2042")]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='membership',
|
||||
name='user',
|
||||
field=models.ForeignKey(verbose_name='user', related_name='memberships', to=settings.AUTH_USER_MODEL),
|
||||
),
|
||||
model_name="membership",
|
||||
name="user",
|
||||
field=models.ForeignKey(
|
||||
verbose_name="user",
|
||||
related_name="memberships",
|
||||
to=settings.AUTH_USER_MODEL,
|
||||
),
|
||||
)
|
||||
]
|
||||
|
||||
@ -7,14 +7,19 @@ import django.db.models.deletion
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('club', '0004_auto_20160915_1057'),
|
||||
]
|
||||
dependencies = [("club", "0004_auto_20160915_1057")]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='club',
|
||||
name='home',
|
||||
field=models.OneToOneField(related_name='home_of_club', blank=True, on_delete=django.db.models.deletion.SET_NULL, verbose_name='home', null=True, to='core.SithFile'),
|
||||
),
|
||||
model_name="club",
|
||||
name="home",
|
||||
field=models.OneToOneField(
|
||||
related_name="home_of_club",
|
||||
blank=True,
|
||||
on_delete=django.db.models.deletion.SET_NULL,
|
||||
verbose_name="home",
|
||||
null=True,
|
||||
to="core.SithFile",
|
||||
),
|
||||
)
|
||||
]
|
||||
|
||||
@ -7,14 +7,14 @@ import django.utils.timezone
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('club', '0005_auto_20161120_1149'),
|
||||
]
|
||||
dependencies = [("club", "0005_auto_20161120_1149")]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='membership',
|
||||
name='start_date',
|
||||
field=models.DateField(verbose_name='start date', default=django.utils.timezone.now),
|
||||
),
|
||||
model_name="membership",
|
||||
name="start_date",
|
||||
field=models.DateField(
|
||||
verbose_name="start date", default=django.utils.timezone.now
|
||||
),
|
||||
)
|
||||
]
|
||||
|
||||
@ -6,13 +6,10 @@ from django.db import migrations, models
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('club', '0006_auto_20161229_0040'),
|
||||
]
|
||||
dependencies = [("club", "0006_auto_20161229_0040")]
|
||||
|
||||
operations = [
|
||||
migrations.AlterModelOptions(
|
||||
name='club',
|
||||
options={'ordering': ['name', 'unix_name']},
|
||||
),
|
||||
name="club", options={"ordering": ["name", "unix_name"]}
|
||||
)
|
||||
]
|
||||
|
||||
@ -6,14 +6,12 @@ from django.db import migrations, models
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('club', '0007_auto_20170324_0917'),
|
||||
]
|
||||
dependencies = [("club", "0007_auto_20170324_0917")]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='club',
|
||||
name='id',
|
||||
model_name="club",
|
||||
name="id",
|
||||
field=models.AutoField(primary_key=True, serialize=False, db_index=True),
|
||||
),
|
||||
)
|
||||
]
|
||||
|
||||
@ -11,31 +11,98 @@ class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||
('club', '0008_auto_20170515_2214'),
|
||||
("club", "0008_auto_20170515_2214"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='Mailing',
|
||||
name="Mailing",
|
||||
fields=[
|
||||
('id', models.AutoField(auto_created=True, verbose_name='ID', serialize=False, primary_key=True)),
|
||||
('email', models.CharField(max_length=256, unique=True, validators=[django.core.validators.RegexValidator(re.compile('(^[-!#$%&\'*+/=?^_`{}|~0-9A-Z]+(\\.[-!#$%&\'*+/=?^_`{}|~0-9A-Z]+)*\\Z|^"([\\001-\\010\\013\\014\\016-\\037!#-\\[\\]-\\177]|\\\\[\\001-\\011\\013\\014\\016-\\177])*"\\Z)', 34), 'Enter a valid address. Only the root of the address is needed.')], verbose_name='Email address')),
|
||||
('is_moderated', models.BooleanField(default=False, verbose_name='is moderated')),
|
||||
('club', models.ForeignKey(verbose_name='Club', related_name='mailings', to='club.Club')),
|
||||
('moderator', models.ForeignKey(null=True, verbose_name='moderator', related_name='moderated_mailings', to=settings.AUTH_USER_MODEL)),
|
||||
(
|
||||
"id",
|
||||
models.AutoField(
|
||||
auto_created=True,
|
||||
verbose_name="ID",
|
||||
serialize=False,
|
||||
primary_key=True,
|
||||
),
|
||||
),
|
||||
(
|
||||
"email",
|
||||
models.CharField(
|
||||
max_length=256,
|
||||
unique=True,
|
||||
validators=[
|
||||
django.core.validators.RegexValidator(
|
||||
re.compile(
|
||||
"(^[-!#$%&'*+/=?^_`{}|~0-9A-Z]+(\\.[-!#$%&'*+/=?^_`{}|~0-9A-Z]+)*\\Z|^\"([\\001-\\010\\013\\014\\016-\\037!#-\\[\\]-\\177]|\\\\[\\001-\\011\\013\\014\\016-\\177])*\"\\Z)",
|
||||
34,
|
||||
),
|
||||
"Enter a valid address. Only the root of the address is needed.",
|
||||
)
|
||||
],
|
||||
verbose_name="Email address",
|
||||
),
|
||||
),
|
||||
(
|
||||
"is_moderated",
|
||||
models.BooleanField(default=False, verbose_name="is moderated"),
|
||||
),
|
||||
(
|
||||
"club",
|
||||
models.ForeignKey(
|
||||
verbose_name="Club", related_name="mailings", to="club.Club"
|
||||
),
|
||||
),
|
||||
(
|
||||
"moderator",
|
||||
models.ForeignKey(
|
||||
null=True,
|
||||
verbose_name="moderator",
|
||||
related_name="moderated_mailings",
|
||||
to=settings.AUTH_USER_MODEL,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='MailingSubscription',
|
||||
name="MailingSubscription",
|
||||
fields=[
|
||||
('id', models.AutoField(auto_created=True, verbose_name='ID', serialize=False, primary_key=True)),
|
||||
('email', models.EmailField(max_length=254, verbose_name='Email address')),
|
||||
('mailing', models.ForeignKey(verbose_name='Mailing', related_name='subscriptions', to='club.Mailing')),
|
||||
('user', models.ForeignKey(null=True, verbose_name='User', related_name='mailing_subscriptions', blank=True, to=settings.AUTH_USER_MODEL)),
|
||||
(
|
||||
"id",
|
||||
models.AutoField(
|
||||
auto_created=True,
|
||||
verbose_name="ID",
|
||||
serialize=False,
|
||||
primary_key=True,
|
||||
),
|
||||
),
|
||||
(
|
||||
"email",
|
||||
models.EmailField(max_length=254, verbose_name="Email address"),
|
||||
),
|
||||
(
|
||||
"mailing",
|
||||
models.ForeignKey(
|
||||
verbose_name="Mailing",
|
||||
related_name="subscriptions",
|
||||
to="club.Mailing",
|
||||
),
|
||||
),
|
||||
(
|
||||
"user",
|
||||
models.ForeignKey(
|
||||
null=True,
|
||||
verbose_name="User",
|
||||
related_name="mailing_subscriptions",
|
||||
blank=True,
|
||||
to=settings.AUTH_USER_MODEL,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
migrations.AlterUniqueTogether(
|
||||
name='mailingsubscription',
|
||||
unique_together=set([('user', 'email', 'mailing')]),
|
||||
name="mailingsubscription",
|
||||
unique_together=set([("user", "email", "mailing")]),
|
||||
),
|
||||
]
|
||||
|
||||
@ -12,34 +12,44 @@ def generate_club_pages(apps, schema_editor):
|
||||
club.make_page()
|
||||
for child in Club.objects.filter(parent=club).all():
|
||||
recursive_generate_club_page(child)
|
||||
|
||||
for club in Club.objects.filter(parent=None).all():
|
||||
recursive_generate_club_page(club)
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('core', '0024_auto_20170906_1317'),
|
||||
('club', '0010_club_logo'),
|
||||
]
|
||||
dependencies = [("core", "0024_auto_20170906_1317"), ("club", "0010_club_logo")]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='club',
|
||||
name='is_active',
|
||||
field=models.BooleanField(default=True, verbose_name='is active'),
|
||||
model_name="club",
|
||||
name="is_active",
|
||||
field=models.BooleanField(default=True, verbose_name="is active"),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='club',
|
||||
name='page',
|
||||
field=models.OneToOneField(related_name='club', blank=True, null=True, to='core.Page'),
|
||||
model_name="club",
|
||||
name="page",
|
||||
field=models.OneToOneField(
|
||||
related_name="club", blank=True, null=True, to="core.Page"
|
||||
),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='club',
|
||||
name='short_description',
|
||||
field=models.CharField(verbose_name='short description', max_length=1000, default='', blank=True, null=True),
|
||||
model_name="club",
|
||||
name="short_description",
|
||||
field=models.CharField(
|
||||
verbose_name="short description",
|
||||
max_length=1000,
|
||||
default="",
|
||||
blank=True,
|
||||
null=True,
|
||||
),
|
||||
),
|
||||
PsqlRunOnly(
|
||||
"SET CONSTRAINTS ALL IMMEDIATE", reverse_sql=migrations.RunSQL.noop
|
||||
),
|
||||
PsqlRunOnly('SET CONSTRAINTS ALL IMMEDIATE', reverse_sql=migrations.RunSQL.noop),
|
||||
migrations.RunPython(generate_club_pages),
|
||||
PsqlRunOnly(migrations.RunSQL.noop, reverse_sql='SET CONSTRAINTS ALL IMMEDIATE'),
|
||||
PsqlRunOnly(
|
||||
migrations.RunSQL.noop, reverse_sql="SET CONSTRAINTS ALL IMMEDIATE"
|
||||
),
|
||||
]
|
||||
|
||||
@ -6,14 +6,14 @@ from django.db import migrations, models
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('club', '0009_auto_20170822_2232'),
|
||||
]
|
||||
dependencies = [("club", "0009_auto_20170822_2232")]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='club',
|
||||
name='logo',
|
||||
field=models.ImageField(null=True, upload_to='club_logos', blank=True, verbose_name='logo'),
|
||||
),
|
||||
model_name="club",
|
||||
name="logo",
|
||||
field=models.ImageField(
|
||||
null=True, upload_to="club_logos", blank=True, verbose_name="logo"
|
||||
),
|
||||
)
|
||||
]
|
||||
|
||||
@ -7,14 +7,16 @@ import club.models
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('club', '0010_auto_20170912_2028'),
|
||||
]
|
||||
dependencies = [("club", "0010_auto_20170912_2028")]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='club',
|
||||
name='owner_group',
|
||||
field=models.ForeignKey(default=club.models.Club.get_default_owner_group, related_name='owned_club', to='core.Group'),
|
||||
),
|
||||
model_name="club",
|
||||
name="owner_group",
|
||||
field=models.ForeignKey(
|
||||
default=club.models.Club.get_default_owner_group,
|
||||
related_name="owned_club",
|
||||
to="core.Group",
|
||||
),
|
||||
)
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user