TTMK/web2.0-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix lint

Browse Source
This commit is contained in:
Aarni Halinen
2022-01-13 23:07:11 +02:00
parent 7cb03d40d4
commit 79cc0bcd55
5 changed files with 78 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kaehmy/migrations/0006_delete_telegramchannel.py
+2 -2
View File
@@ -6,11 +6,11 @@ from django.db import migrations
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('kaehmy', '0005_auto_20190312_1458'), ("kaehmy", "0005_auto_20190312_1458"),
] ]
operations = [ operations = [
migrations.DeleteModel( migrations.DeleteModel(
name='TelegramChannel', name="TelegramChannel",
), ),
] ]
kaehmy/models.py
+3 -1
View File
@@ -159,4 +159,6 @@ class Application(CommentParent):
return ", ".join(combined) if len(combined) > 0 else "" return ", ".join(combined) if len(combined) > 0 else ""
def has_any_board_role(self): def has_any_board_role(self):
return self.preset_roles.filter(is_board=True).exists() or self.custom_roles.filter(is_board=True) return self.preset_roles.filter(
is_board=True
).exists() or self.custom_roles.filter(is_board=True)
webapp/admin.py
+12 -1
View File
@@ -1,7 +1,18 @@
"""File containing webapp app admin registers.""" """File containing webapp app admin registers."""
from django.contrib import admin from django.contrib import admin
from webapp.models import Feed, Tag, Event, Signup, SignupForm, TemplateQuestion, JobAd, BaseWebhook, GenericWebhook, TelegramHook from webapp.models import (
Feed,
Tag,
Event,
Signup,
SignupForm,
TemplateQuestion,
JobAd,
BaseWebhook,
GenericWebhook,
TelegramHook,
)
from modeltranslation.admin import TranslationAdmin from modeltranslation.admin import TranslationAdmin
from django.contrib.auth.models import Permission from django.contrib.auth.models import Permission
webapp/migrations/0078_basewebhook_genericwebhook_telegramhook.py
+56 -30
View File
@@ -7,53 +7,79 @@ import django.db.models.deletion
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('contenttypes', '0002_remove_content_type_name'), ("contenttypes", "0002_remove_content_type_name"),
('webapp', '0077_templatequestion_deleted'), ("webapp", "0077_templatequestion_deleted"),
] ]
operations = [ operations = [
migrations.CreateModel( migrations.CreateModel(
name='BaseWebhook', name="BaseWebhook",
fields=[ fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), (
('name', models.CharField(max_length=255)), "id",
('url', models.URLField()), models.AutoField(
('kaehmy_submit', models.BooleanField(default=False)), auto_created=True,
('ohlhafv_submit', models.BooleanField(default=False)), primary_key=True,
('feed_published', models.BooleanField(default=False)), serialize=False,
('jobad_published', models.BooleanField(default=False)), verbose_name="ID",
('event_published', models.BooleanField(default=False)), ),
('signup_opened', models.BooleanField(default=False)), ),
('polymorphic_ctype', models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='polymorphic_webapp.basewebhook_set+', to='contenttypes.ContentType')), ("name", models.CharField(max_length=255)),
("url", models.URLField()),
("kaehmy_submit", models.BooleanField(default=False)),
("ohlhafv_submit", models.BooleanField(default=False)),
("feed_published", models.BooleanField(default=False)),
("jobad_published", models.BooleanField(default=False)),
("event_published", models.BooleanField(default=False)),
("signup_opened", models.BooleanField(default=False)),
(
"polymorphic_ctype",
models.ForeignKey(
editable=False,
null=True,
on_delete=django.db.models.deletion.CASCADE,
related_name="polymorphic_webapp.basewebhook_set+",
to="contenttypes.ContentType",
),
),
], ],
options={ options={
'abstract': False, "abstract": False,
'base_manager_name': 'objects', "base_manager_name": "objects",
}, },
), ),
migrations.CreateModel( migrations.CreateModel(
name='TelegramHook', name="TelegramHook",
fields=[ fields=[
('basewebhook_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='webapp.BaseWebhook')), (
('channel_id', models.CharField(max_length=255, unique=True)), "basewebhook_ptr",
models.OneToOneField(
auto_created=True,
on_delete=django.db.models.deletion.CASCADE,
parent_link=True,
primary_key=True,
serialize=False,
to="webapp.BaseWebhook",
),
),
("channel_id", models.CharField(max_length=255, unique=True)),
], ],
options={ options={
'verbose_name': 'Telegram channel', "verbose_name": "Telegram channel",
'verbose_name_plural': 'Telegram channels', "verbose_name_plural": "Telegram channels",
}, },
bases=('webapp.basewebhook',), bases=("webapp.basewebhook",),
), ),
migrations.CreateModel( migrations.CreateModel(
name='GenericWebhook', name="GenericWebhook",
fields=[ fields=[],
],
options={ options={
'verbose_name': 'Webhook', "verbose_name": "Webhook",
'verbose_name_plural': 'Webhooks', "verbose_name_plural": "Webhooks",
'proxy': True, "proxy": True,
'indexes': [], "indexes": [],
'constraints': [], "constraints": [],
}, },
bases=('webapp.basewebhook',), bases=("webapp.basewebhook",),
), ),
] ]
webapp/translation.py
+5 -1
View File
@@ -41,7 +41,11 @@ class TemplateQuestionTranslationOptions(TranslationOptions):
@register(JobAd) @register(JobAd)
class JobAdTranslationOptions(TranslationOptions): class JobAdTranslationOptions(TranslationOptions):
fields = ('title', 'description', 'content',) fields = (
"title",
"description",
"content",
)
@register(BaseWebhook) @register(BaseWebhook)