From 042310ef9ae1217c82bf91a431234f1df2b441a5 Mon Sep 17 00:00:00 2001
From: rlacko <rlacko@sch.bme.hu>
Date: Mon, 3 Feb 2020 14:08:20 +0100
Subject: [PATCH] flake fix
---
src/account/migrations/0001_initial.py | 21 ++++++++++++-------
.../migrations/0002_auto_20190122_1341.py | 3 ++-
.../migrations/0003_auto_20200202_1541.py | 3 ++-
src/account/models.py | 11 ++++++----
src/account/resources.py | 3 ++-
src/account/serializers.py | 3 ++-
src/account/views.py | 2 +-
src/common/email.py | 6 ++++--
src/common/permissions.py | 7 ++++---
src/document/migrations/0001_initial.py | 12 +++++++----
.../migrations/0002_auto_20190121_1332.py | 3 ++-
.../migrations/0003_auto_20190121_1335.py | 3 ++-
.../migrations/0004_auto_20190123_1812.py | 3 ++-
.../migrations/0005_auto_20190129_1438.py | 3 ++-
.../migrations/0006_auto_20200203_0016.py | 3 ++-
src/document/models.py | 3 ++-
src/groups/migrations/0001_initial.py | 3 ++-
src/groups/models.py | 6 ++++--
src/groups/serializers.py | 2 --
src/groups/tests.py | 2 +-
src/groups/views.py | 2 +-
src/homework/migrations/0001_initial.py | 15 ++++++++-----
src/homework/models.py | 3 ++-
src/kszkepzes/settings/local.py | 2 +-
src/kszkepzes/urls.py | 12 +++++++----
src/kszkepzes/wsgi.py | 3 ++-
src/mentors/migrations/0001_initial.py | 9 +++++---
src/mentors/models.py | 3 ++-
src/mentors/serializers.py | 1 -
src/news/migrations/0001_initial.py | 9 +++++---
.../migrations/0002_auto_20200202_1541.py | 3 ++-
src/news/serializers.py | 1 -
src/stats/admin.py | 3 ++-
src/stats/migrations/0001_initial.py | 21 ++++++++++++-------
.../migrations/0003_auto_20190122_1449.py | 6 ++++--
src/stats/models.py | 6 ++++--
src/stats/resources.py | 3 ++-
src/stats/urls.py | 6 ++++--
38 files changed, 135 insertions(+), 75 deletions(-)
diff --git a/src/account/migrations/0001_initial.py b/src/account/migrations/0001_initial.py
index 8550f16..8a477bd 100644
--- a/src/account/migrations/0001_initial.py
+++ b/src/account/migrations/0001_initial.py
@@ -17,7 +17,8 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='Deadline',
fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('id', models.AutoField(auto_created=True,
+ primary_key=True, serialize=False, verbose_name='ID')),
('deadline', models.DateTimeField(null=True)),
],
options={
@@ -27,14 +28,17 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='GroupChoice',
fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('choice', models.CharField(choices=[('DT', 'DevTeam'), ('NET', 'NeTeam'), ('ST', 'SecurITeam'), ('SYS', 'SysAdmin'), ('HAT', 'Hallgatói Tudásbázis'), ('N', 'None')], default='N', max_length=10, unique=True)),
+ ('id', models.AutoField(auto_created=True,
+ primary_key=True, serialize=False, verbose_name='ID')),
+ ('choice', models.CharField(choices=[('DT', 'DevTeam'), ('NET', 'NeTeam'), ('ST', 'SecurITeam'), (
+ 'SYS', 'SysAdmin'), ('HAT', 'Hallgatói Tudásbázis'), ('N', 'None')], default='N', max_length=10, unique=True)),
],
),
migrations.CreateModel(
name='Profile',
fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('id', models.AutoField(auto_created=True,
+ primary_key=True, serialize=False, verbose_name='ID')),
('join_date', models.DateTimeField(auto_now_add=True)),
('updated_at', models.DateTimeField(auto_now=True)),
('motivation_about', models.TextField(blank=True, default='')),
@@ -42,9 +46,12 @@ class Migration(migrations.Migration):
('motivation_exercise', models.TextField(blank=True, default='')),
('nick', models.CharField(blank=True, default='', max_length=15)),
('signed', models.BooleanField(default=False)),
- ('role', models.CharField(choices=[('Staff', 'Staff'), ('Applicant', 'Applicant'), ('Student', 'Student')], default='Applicant', max_length=10)),
- ('groups', models.ManyToManyField(blank=True, related_name='profiles', to='account.GroupChoice')),
- ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='profile', to=settings.AUTH_USER_MODEL)),
+ ('role', models.CharField(choices=[('Staff', 'Staff'), ('Applicant', 'Applicant'), (
+ 'Student', 'Student')], default='Applicant', max_length=10)),
+ ('groups', models.ManyToManyField(blank=True,
+ related_name='profiles', to='account.GroupChoice')),
+ ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE,
+ related_name='profile', to=settings.AUTH_USER_MODEL)),
],
),
]
diff --git a/src/account/migrations/0002_auto_20190122_1341.py b/src/account/migrations/0002_auto_20190122_1341.py
index e9ee7b6..bb010a2 100644
--- a/src/account/migrations/0002_auto_20190122_1341.py
+++ b/src/account/migrations/0002_auto_20190122_1341.py
@@ -13,6 +13,7 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='profile',
name='role',
- field=models.CharField(choices=[('Staff', 'Staff'), ('Applicant', 'Applicant'), ('Student', 'Student'), ('Denied', 'Denied')], default='Applicant', max_length=10),
+ field=models.CharField(choices=[('Staff', 'Staff'), ('Applicant', 'Applicant'), (
+ 'Student', 'Student'), ('Denied', 'Denied')], default='Applicant', max_length=10),
),
]
diff --git a/src/account/migrations/0003_auto_20200202_1541.py b/src/account/migrations/0003_auto_20200202_1541.py
index dcc6f8b..fdfda98 100644
--- a/src/account/migrations/0003_auto_20200202_1541.py
+++ b/src/account/migrations/0003_auto_20200202_1541.py
@@ -18,6 +18,7 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='profile',
name='image',
- field=models.ImageField(blank=True, null=True, upload_to='accounts/images/'),
+ field=models.ImageField(
+ blank=True, null=True, upload_to='accounts/images/'),
),
]
diff --git a/src/account/models.py b/src/account/models.py
index 21bfbfa..40a3847 100644
--- a/src/account/models.py
+++ b/src/account/models.py
@@ -2,7 +2,7 @@ from django.db import models
from django.contrib.auth.models import User
from solo.models import SingletonModel
from django.db.models import Sum
-from django.db.models.functions import Coalesce
+
class GroupChoice(models.Model):
TEAMS = (
@@ -46,14 +46,17 @@ class Profile(models.Model):
groups = models.ManyToManyField(
GroupChoice, related_name='profiles', blank=True)
role = models.CharField(max_length=10, choices=ROLES, default='Applicant')
-
+
@property
def events_visited(self):
return self.events_visitor.all().count()
-
+
@property
def homework_bits(self):
- return self.solution.filter(accepted=True).values('task__bits').aggregate(total_bits=Sum('task__bits')).get('total_bits')
+ return self.solution.filter(accepted=True) \
+ .values('task__bits') \
+ .aggregate(total_bits=Sum('task__bits')) \
+ .get('total_bits')
@property
def full_name(self):
diff --git a/src/account/resources.py b/src/account/resources.py
index 4682f63..1217cad 100644
--- a/src/account/resources.py
+++ b/src/account/resources.py
@@ -5,7 +5,8 @@ from . import models
class SignUpResource(resources.ModelResource):
groups = fields.Field(
attribute='groups',
- widget=widgets.ManyToManyWidget(model=models.GroupChoice, separator=' ,', field='choice'),
+ widget=widgets.ManyToManyWidget(
+ model=models.GroupChoice, separator=' ,', field='choice'),
)
class Meta:
diff --git a/src/account/serializers.py b/src/account/serializers.py
index 01ba66c..ae7b5ba 100644
--- a/src/account/serializers.py
+++ b/src/account/serializers.py
@@ -9,6 +9,7 @@ class ChoiceSerializer(serializers.ModelSerializer):
model = models.GroupChoice
fields = ('choice', 'profile')
+
class ProfileSerializer_User(serializers.ModelSerializer):
groups = serializers.SlugRelatedField(
many=True,
@@ -66,7 +67,7 @@ class ProfileSerializer_User(serializers.ModelSerializer):
def get_full_name(self, obj):
return obj.full_name
-
+
def get_bits(self, obj):
if obj.homework_bits is None:
return obj.events_visited
diff --git a/src/account/views.py b/src/account/views.py
index 9321def..4f88c51 100644
--- a/src/account/views.py
+++ b/src/account/views.py
@@ -31,7 +31,7 @@ class ProfileViewSet(viewsets.ModelViewSet):
def me(self, request):
serializer = self.serializer_class(request.user.profile)
return Response(serializer.data)
-
+
@action(detail=False)
def deadline(self, request):
deadline = models.Deadline.get_solo()
diff --git a/src/common/email.py b/src/common/email.py
index 45b8705..804231f 100644
--- a/src/common/email.py
+++ b/src/common/email.py
@@ -36,7 +36,8 @@ def new_homework(user, deadline):
deadline = deadline.strftime('%Y-%m-%d %H:%M')
subject = "Új házifeladat"
message = read_email('new_homework.txt')
- message = str.format(message % {'name': user.get_full_name(), 'link': link, 'deadline': deadline})
+ message = str.format(
+ message % {'name': user.get_full_name(), 'link': link, 'deadline': deadline})
send_mail(subject, message, sender_email, [user.email, ])
@@ -47,5 +48,6 @@ def homework_corrected(user, title, accepted):
else:
status = 'Hibás'
message = read_email('homework_corrected.txt')
- message = str.format(message % {'name': user.get_full_name(), 'link': link, 'status': status, 'title': title})
+ message = str.format(message % {'name': user.get_full_name(
+ ), 'link': link, 'status': status, 'title': title})
send_mail(subject, message, sender_email, [user.email, ])
diff --git a/src/common/permissions.py b/src/common/permissions.py
index 7d2384c..7101919 100644
--- a/src/common/permissions.py
+++ b/src/common/permissions.py
@@ -5,13 +5,13 @@ from rest_framework.permissions import SAFE_METHODS
class IsStaffOrReadOnly(BasePermission):
def has_permission(self, request, view):
return request.method in SAFE_METHODS or\
- (request.user.is_authenticated and request.user.profile.role == 'Staff')
+ (request.user.is_authenticated and request.user.profile.role == 'Staff')
class IsStaffOrReadOnlyForAuthenticated(BasePermission):
def has_permission(self, request, view):
return request.user.is_authenticated and\
- (request.method in SAFE_METHODS or request.user.profile.role == 'Staff')
+ (request.method in SAFE_METHODS or request.user.profile.role == 'Staff')
class IsStaffUser(BasePermission):
@@ -27,4 +27,5 @@ class IsSafeOrPatch(BasePermission):
class IsStaffOrStudent(BasePermission):
def has_permission(self, request, view):
return request.user.is_authenticated and\
- (request.user.profile.role == 'Staff' or request.user.profile.role == 'Student')
+ (request.user.profile.role ==
+ 'Staff' or request.user.profile.role == 'Student')
diff --git a/src/document/migrations/0001_initial.py b/src/document/migrations/0001_initial.py
index 4348982..7b6f640 100644
--- a/src/document/migrations/0001_initial.py
+++ b/src/document/migrations/0001_initial.py
@@ -21,13 +21,17 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='Document',
fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('id', models.AutoField(auto_created=True,
+ primary_key=True, serialize=False, verbose_name='ID')),
('uploaded_at', models.DateTimeField(auto_now_add=True)),
('name', models.CharField(blank=True, default='', max_length=150)),
('description', models.TextField(blank=True, default='')),
- ('file', models.FileField(blank=True, null=True, upload_to=document.models.document_file_name, validators=[django.core.validators.FileExtensionValidator(['png', 'jpeg', 'jpg', 'zip']), common.validators.FileSizeValidator(size_limit=52428800)])),
- ('solution', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='files', to='homework.Solution')),
- ('uploaded_by', models.ForeignKey(default=common.middleware.CurrentUserMiddleware.get_current_user_profile, on_delete=django.db.models.deletion.DO_NOTHING, related_name='documents', to='account.Profile')),
+ ('file', models.FileField(blank=True, null=True, upload_to=document.models.document_file_name, validators=[
+ django.core.validators.FileExtensionValidator(['png', 'jpeg', 'jpg', 'zip']), common.validators.FileSizeValidator(size_limit=52428800)])),
+ ('solution', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE,
+ related_name='files', to='homework.Solution')),
+ ('uploaded_by', models.ForeignKey(default=common.middleware.CurrentUserMiddleware.get_current_user_profile,
+ on_delete=django.db.models.deletion.DO_NOTHING, related_name='documents', to='account.Profile')),
],
),
]
diff --git a/src/document/migrations/0002_auto_20190121_1332.py b/src/document/migrations/0002_auto_20190121_1332.py
index 5cf755b..3e91175 100644
--- a/src/document/migrations/0002_auto_20190121_1332.py
+++ b/src/document/migrations/0002_auto_20190121_1332.py
@@ -15,6 +15,7 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='document',
name='file',
- field=models.FileField(blank=True, default='', upload_to='', validators=[django.core.validators.FileExtensionValidator(['png', 'jpeg', 'jpg', 'zip']), common.validators.FileSizeValidator(size_limit=52428800)]),
+ field=models.FileField(blank=True, default='', upload_to='', validators=[django.core.validators.FileExtensionValidator(
+ ['png', 'jpeg', 'jpg', 'zip']), common.validators.FileSizeValidator(size_limit=52428800)]),
),
]
diff --git a/src/document/migrations/0003_auto_20190121_1335.py b/src/document/migrations/0003_auto_20190121_1335.py
index fa4d1c2..fe059ec 100644
--- a/src/document/migrations/0003_auto_20190121_1335.py
+++ b/src/document/migrations/0003_auto_20190121_1335.py
@@ -15,6 +15,7 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='document',
name='file',
- field=models.FileField(blank=True, upload_to='', validators=[django.core.validators.FileExtensionValidator(['png', 'jpeg', 'jpg', 'zip']), common.validators.FileSizeValidator(size_limit=52428800)]),
+ field=models.FileField(blank=True, upload_to='', validators=[django.core.validators.FileExtensionValidator(
+ ['png', 'jpeg', 'jpg', 'zip']), common.validators.FileSizeValidator(size_limit=52428800)]),
),
]
diff --git a/src/document/migrations/0004_auto_20190123_1812.py b/src/document/migrations/0004_auto_20190123_1812.py
index 9eb42c6..95a9a1c 100644
--- a/src/document/migrations/0004_auto_20190123_1812.py
+++ b/src/document/migrations/0004_auto_20190123_1812.py
@@ -14,6 +14,7 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='document',
name='solution',
- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='files', to='homework.Solution'),
+ field=models.ForeignKey(
+ on_delete=django.db.models.deletion.CASCADE, related_name='files', to='homework.Solution'),
),
]
diff --git a/src/document/migrations/0005_auto_20190129_1438.py b/src/document/migrations/0005_auto_20190129_1438.py
index 5c207c4..da8acfc 100644
--- a/src/document/migrations/0005_auto_20190129_1438.py
+++ b/src/document/migrations/0005_auto_20190129_1438.py
@@ -15,7 +15,8 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='document',
name='file',
- field=models.FileField(blank=True, null=True, upload_to='', validators=[django.core.validators.FileExtensionValidator(['png', 'jpeg', 'jpg', 'zip']), common.validators.FileSizeValidator(size_limit=52428800)]),
+ field=models.FileField(blank=True, null=True, upload_to='', validators=[django.core.validators.FileExtensionValidator(
+ ['png', 'jpeg', 'jpg', 'zip']), common.validators.FileSizeValidator(size_limit=52428800)]),
),
migrations.AlterField(
model_name='document',
diff --git a/src/document/migrations/0006_auto_20200203_0016.py b/src/document/migrations/0006_auto_20200203_0016.py
index 4fe709a..a8e13ce 100644
--- a/src/document/migrations/0006_auto_20200203_0016.py
+++ b/src/document/migrations/0006_auto_20200203_0016.py
@@ -16,6 +16,7 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='document',
name='file',
- field=models.FileField(blank=True, null=True, upload_to=document.models.document_file_name, validators=[django.core.validators.FileExtensionValidator(['png', 'jpeg', 'jpg', 'zip']), common.validators.FileSizeValidator(size_limit=52428800)]),
+ field=models.FileField(blank=True, null=True, upload_to=document.models.document_file_name, validators=[
+ django.core.validators.FileExtensionValidator(['png', 'jpeg', 'jpg', 'zip']), common.validators.FileSizeValidator(size_limit=52428800)]),
),
]
diff --git a/src/document/models.py b/src/document/models.py
index efa6d39..11eeb96 100644
--- a/src/document/models.py
+++ b/src/document/models.py
@@ -43,7 +43,8 @@ class Document(models.Model):
null=True,
upload_to=document_file_name
)
- solution = models.ForeignKey(Solution, related_name='files', on_delete=models.CASCADE)
+ solution = models.ForeignKey(
+ Solution, related_name='files', on_delete=models.CASCADE)
def __str__(self):
return self.name
diff --git a/src/groups/migrations/0001_initial.py b/src/groups/migrations/0001_initial.py
index a0a4157..643e9ba 100644
--- a/src/groups/migrations/0001_initial.py
+++ b/src/groups/migrations/0001_initial.py
@@ -14,7 +14,8 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='Group',
fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('id', models.AutoField(auto_created=True,
+ primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(blank=True, default='', max_length=50)),
('description', models.TextField(blank=True, default='')),
],
diff --git a/src/groups/models.py b/src/groups/models.py
index 88a35cf..2953fdc 100644
--- a/src/groups/models.py
+++ b/src/groups/models.py
@@ -1,9 +1,11 @@
from django.db import models
# KSZK groups, like Devteam, Sysadmin, ...
+
+
class Group(models.Model):
name = models.CharField(max_length=50, blank=True, default='')
description = models.TextField(blank=True, default='')
-
+
def __str__(self):
- return self.name
\ No newline at end of file
+ return self.name
diff --git a/src/groups/serializers.py b/src/groups/serializers.py
index 0baeea0..2f14fa7 100644
--- a/src/groups/serializers.py
+++ b/src/groups/serializers.py
@@ -14,5 +14,3 @@ class GroupSerializer(serializers.ModelSerializer):
'name',
'description',
)
-
-
diff --git a/src/groups/tests.py b/src/groups/tests.py
index 7ce503c..a79ca8b 100644
--- a/src/groups/tests.py
+++ b/src/groups/tests.py
@@ -1,3 +1,3 @@
-from django.test import TestCase
+# from django.test import TestCase
# Create your tests here.
diff --git a/src/groups/views.py b/src/groups/views.py
index e22f113..2149906 100644
--- a/src/groups/views.py
+++ b/src/groups/views.py
@@ -3,7 +3,7 @@ from rest_framework import viewsets
from . import serializers
from . import models
+
class GroupsViewSet(viewsets.ReadOnlyModelViewSet):
serializer_class = serializers.GroupSerializer
queryset = models.Group.objects.all()
-
\ No newline at end of file
diff --git a/src/homework/migrations/0001_initial.py b/src/homework/migrations/0001_initial.py
index 1312534..d41fc71 100644
--- a/src/homework/migrations/0001_initial.py
+++ b/src/homework/migrations/0001_initial.py
@@ -17,30 +17,35 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='Solution',
fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('id', models.AutoField(auto_created=True,
+ primary_key=True, serialize=False, verbose_name='ID')),
('created_at', models.DateTimeField(auto_now_add=True)),
('updated_at', models.DateTimeField(auto_now=True)),
('note', models.TextField(blank=True, default='')),
('accepted', models.BooleanField()),
('corrected', models.BooleanField()),
- ('created_by', models.ForeignKey(default=common.middleware.CurrentUserMiddleware.get_current_user_profile, on_delete=django.db.models.deletion.DO_NOTHING, related_name='solution', to='account.Profile')),
+ ('created_by', models.ForeignKey(default=common.middleware.CurrentUserMiddleware.get_current_user_profile,
+ on_delete=django.db.models.deletion.DO_NOTHING, related_name='solution', to='account.Profile')),
],
),
migrations.CreateModel(
name='Task',
fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('id', models.AutoField(auto_created=True,
+ primary_key=True, serialize=False, verbose_name='ID')),
('created_at', models.DateTimeField(auto_now_add=True)),
('updated_at', models.DateTimeField(auto_now=True)),
('title', models.CharField(max_length=150)),
('text', models.TextField()),
('deadline', models.DateTimeField()),
- ('created_by', models.ForeignKey(default=common.middleware.CurrentUserMiddleware.get_current_user_profile, on_delete=django.db.models.deletion.DO_NOTHING, related_name='tasks', to='account.Profile')),
+ ('created_by', models.ForeignKey(default=common.middleware.CurrentUserMiddleware.get_current_user_profile,
+ on_delete=django.db.models.deletion.DO_NOTHING, related_name='tasks', to='account.Profile')),
],
),
migrations.AddField(
model_name='solution',
name='task',
- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='solutions', to='homework.Task'),
+ field=models.ForeignKey(
+ on_delete=django.db.models.deletion.CASCADE, related_name='solutions', to='homework.Task'),
),
]
diff --git a/src/homework/models.py b/src/homework/models.py
index 6bc36ce..75fddd9 100755
--- a/src/homework/models.py
+++ b/src/homework/models.py
@@ -22,7 +22,8 @@ class Task(models.Model):
class Solution(models.Model):
- task = models.ForeignKey(Task, related_name='solutions', on_delete=models.CASCADE)
+ task = models.ForeignKey(
+ Task, related_name='solutions', on_delete=models.CASCADE)
created_by = models.ForeignKey(
Profile,
related_name='solution',
diff --git a/src/kszkepzes/settings/local.py b/src/kszkepzes/settings/local.py
index 53eb49a..caa2719 100644
--- a/src/kszkepzes/settings/local.py
+++ b/src/kszkepzes/settings/local.py
@@ -1,6 +1,6 @@
from .base import *
-SESSION_COOKIE_SECURE=False
+SESSION_COOKIE_SECURE = False
EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
EMAIL_HOST = 'smtp.gmail.com'
EMAIL_USE_TLS = True
diff --git a/src/kszkepzes/urls.py b/src/kszkepzes/urls.py
index 36b2b6b..0760d77 100644
--- a/src/kszkepzes/urls.py
+++ b/src/kszkepzes/urls.py
@@ -22,9 +22,12 @@ schema_view = get_schema_view(
)
urlpatterns = [
- url(r'^api/v1/swagger(?P<format>\.json|\.yaml)$', schema_view.without_ui(cache_timeout=0), name='schema-json'),
- url(r'^api/v1/swagger/$', schema_view.with_ui('swagger', cache_timeout=0), name='schema-swagger-ui'),
- url(r'^api/v1/redoc/$', schema_view.with_ui('redoc', cache_timeout=0), name='schema-redoc'),
+ url(r'^api/v1/swagger(?P<format>\.json|\.yaml)$',
+ schema_view.without_ui(cache_timeout=0), name='schema-json'),
+ url(r'^api/v1/swagger/$', schema_view.with_ui('swagger',
+ cache_timeout=0), name='schema-swagger-ui'),
+ url(r'^api/v1/redoc/$', schema_view.with_ui('redoc',
+ cache_timeout=0), name='schema-redoc'),
url(r'^admin/', admin.site.urls),
url(r'^api/v1/', include('social_django.urls', namespace='social')),
url(r'^api/v1/homework/', include('homework.urls')),
@@ -38,4 +41,5 @@ urlpatterns = [
]
if settings.DEBUG:
- urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+ urlpatterns += static(settings.MEDIA_URL,
+ document_root=settings.MEDIA_ROOT)
diff --git a/src/kszkepzes/wsgi.py b/src/kszkepzes/wsgi.py
index 12023b6..f29c759 100644
--- a/src/kszkepzes/wsgi.py
+++ b/src/kszkepzes/wsgi.py
@@ -11,6 +11,7 @@ import os
from django.core.wsgi import get_wsgi_application
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "kszkepzes.settings.production")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE",
+ "kszkepzes.settings.production")
application = get_wsgi_application()
diff --git a/src/mentors/migrations/0001_initial.py b/src/mentors/migrations/0001_initial.py
index ef3982a..782fbdc 100644
--- a/src/mentors/migrations/0001_initial.py
+++ b/src/mentors/migrations/0001_initial.py
@@ -17,12 +17,15 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='Mentor',
fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('id', models.AutoField(auto_created=True,
+ primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=200)),
('text', models.TextField()),
- ('image', models.ImageField(blank=True, null=True, upload_to='mentors/images/')),
+ ('image', models.ImageField(blank=True,
+ null=True, upload_to='mentors/images/')),
('email', models.EmailField(max_length=254)),
- ('mentor', models.ForeignKey(default=common.middleware.CurrentUserMiddleware.get_current_user_profile, on_delete=django.db.models.deletion.DO_NOTHING, related_name='mentor', to='account.Profile')),
+ ('mentor', models.ForeignKey(default=common.middleware.CurrentUserMiddleware.get_current_user_profile,
+ on_delete=django.db.models.deletion.DO_NOTHING, related_name='mentor', to='account.Profile')),
],
),
]
diff --git a/src/mentors/models.py b/src/mentors/models.py
index 75e6470..59b9a72 100644
--- a/src/mentors/models.py
+++ b/src/mentors/models.py
@@ -12,7 +12,8 @@ class Mentor(models.Model):
)
name = models.CharField(null=False, max_length=200)
text = models.TextField()
- image = models.ImageField(upload_to='mentors/images/', null=True, blank=True)
+ image = models.ImageField(
+ upload_to='mentors/images/', null=True, blank=True)
email = models.EmailField()
def __str__(self):
diff --git a/src/mentors/serializers.py b/src/mentors/serializers.py
index c5ef6d7..a32b29c 100644
--- a/src/mentors/serializers.py
+++ b/src/mentors/serializers.py
@@ -1,6 +1,5 @@
from mentors.models import Mentor
from rest_framework import serializers
-from common.serializers import CurrentUserProfileDefault
class MentorSerializer(serializers.ModelSerializer):
diff --git a/src/news/migrations/0001_initial.py b/src/news/migrations/0001_initial.py
index a8f40ce..844a7e2 100644
--- a/src/news/migrations/0001_initial.py
+++ b/src/news/migrations/0001_initial.py
@@ -17,13 +17,16 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='Article',
fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('id', models.AutoField(auto_created=True,
+ primary_key=True, serialize=False, verbose_name='ID')),
('title', models.CharField(max_length=200)),
('text', models.TextField()),
('created_at', models.DateTimeField(auto_now_add=True)),
('updated_at', models.DateTimeField(auto_now=True)),
- ('author', models.ForeignKey(default=common.middleware.CurrentUserMiddleware.get_current_user_profile, on_delete=django.db.models.deletion.DO_NOTHING, related_name='author', to='account.Profile')),
- ('updated_by', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, related_name='updater', to='account.Profile')),
+ ('author', models.ForeignKey(default=common.middleware.CurrentUserMiddleware.get_current_user_profile,
+ on_delete=django.db.models.deletion.DO_NOTHING, related_name='author', to='account.Profile')),
+ ('updated_by', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING,
+ related_name='updater', to='account.Profile')),
],
),
]
diff --git a/src/news/migrations/0002_auto_20200202_1541.py b/src/news/migrations/0002_auto_20200202_1541.py
index 07d6f60..ecd6a50 100644
--- a/src/news/migrations/0002_auto_20200202_1541.py
+++ b/src/news/migrations/0002_auto_20200202_1541.py
@@ -15,6 +15,7 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='article',
name='updated_by',
- field=models.ForeignKey(default=common.middleware.CurrentUserMiddleware.get_current_user_profile, on_delete=django.db.models.deletion.DO_NOTHING, related_name='updater', to='account.Profile'),
+ field=models.ForeignKey(default=common.middleware.CurrentUserMiddleware.get_current_user_profile,
+ on_delete=django.db.models.deletion.DO_NOTHING, related_name='updater', to='account.Profile'),
),
]
diff --git a/src/news/serializers.py b/src/news/serializers.py
index c6a8462..7d967b5 100644
--- a/src/news/serializers.py
+++ b/src/news/serializers.py
@@ -1,6 +1,5 @@
from news.models import Article
from rest_framework import serializers
-from common.serializers import CurrentUserProfileDefault
class ArticleSerializer(serializers.ModelSerializer):
diff --git a/src/stats/admin.py b/src/stats/admin.py
index fb84160..6c3f3b7 100644
--- a/src/stats/admin.py
+++ b/src/stats/admin.py
@@ -15,7 +15,8 @@ class EventAdmin(ExportMixin, admin.ModelAdmin):
@admin.register(models.Note)
class NoteAdmin(ExportMixin, admin.ModelAdmin):
- list_display = ('profile', 'note', 'event', 'created_by', 'created_at', 'updated_at')
+ list_display = ('profile', 'note', 'event',
+ 'created_by', 'created_at', 'updated_at')
list_filter = ('profile', 'created_by', 'event')
search_fields = ('event__name', 'note')
resource_class = resources.NoteResource
diff --git a/src/stats/migrations/0001_initial.py b/src/stats/migrations/0001_initial.py
index b6e989e..2bc6a35 100644
--- a/src/stats/migrations/0001_initial.py
+++ b/src/stats/migrations/0001_initial.py
@@ -17,25 +17,32 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='Event',
fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('id', models.AutoField(auto_created=True,
+ primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=255)),
('date', models.DateTimeField()),
('created_at', models.DateTimeField(auto_now_add=True)),
('updated_at', models.DateTimeField(auto_now=True)),
- ('created_by', models.ForeignKey(default=common.middleware.CurrentUserMiddleware.get_current_user_profile, on_delete=django.db.models.deletion.DO_NOTHING, related_name='created_event', to='account.Profile')),
- ('visitors', models.ManyToManyField(blank=True, related_name='events', to='account.Profile')),
+ ('created_by', models.ForeignKey(default=common.middleware.CurrentUserMiddleware.get_current_user_profile,
+ on_delete=django.db.models.deletion.DO_NOTHING, related_name='created_event', to='account.Profile')),
+ ('visitors', models.ManyToManyField(blank=True,
+ related_name='events', to='account.Profile')),
],
),
migrations.CreateModel(
name='Note',
fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('id', models.AutoField(auto_created=True,
+ primary_key=True, serialize=False, verbose_name='ID')),
('note', models.TextField()),
('created_at', models.DateTimeField(auto_now_add=True)),
('updated_at', models.DateTimeField(auto_now=True)),
- ('created_by', models.ForeignKey(default=common.middleware.CurrentUserMiddleware.get_current_user_profile, on_delete=django.db.models.deletion.DO_NOTHING, related_name='created_notes', to='account.Profile')),
- ('event', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='notes', to='stats.Event')),
- ('profile', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='notes', to='account.Profile')),
+ ('created_by', models.ForeignKey(default=common.middleware.CurrentUserMiddleware.get_current_user_profile,
+ on_delete=django.db.models.deletion.DO_NOTHING, related_name='created_notes', to='account.Profile')),
+ ('event', models.ForeignKey(blank=True, null=True,
+ on_delete=django.db.models.deletion.CASCADE, related_name='notes', to='stats.Event')),
+ ('profile', models.ForeignKey(blank=True, null=True,
+ on_delete=django.db.models.deletion.CASCADE, related_name='notes', to='account.Profile')),
],
),
]
diff --git a/src/stats/migrations/0003_auto_20190122_1449.py b/src/stats/migrations/0003_auto_20190122_1449.py
index a3689e8..264620d 100644
--- a/src/stats/migrations/0003_auto_20190122_1449.py
+++ b/src/stats/migrations/0003_auto_20190122_1449.py
@@ -14,11 +14,13 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='event',
name='absent',
- field=models.ManyToManyField(blank=True, related_name='events_absent', to='account.Profile'),
+ field=models.ManyToManyField(
+ blank=True, related_name='events_absent', to='account.Profile'),
),
migrations.AlterField(
model_name='event',
name='visitors',
- field=models.ManyToManyField(blank=True, related_name='events_visitor', to='account.Profile'),
+ field=models.ManyToManyField(
+ blank=True, related_name='events_visitor', to='account.Profile'),
),
]
diff --git a/src/stats/models.py b/src/stats/models.py
index be95820..762173f 100644
--- a/src/stats/models.py
+++ b/src/stats/models.py
@@ -31,8 +31,10 @@ class Event(models.Model):
class Note(models.Model):
- event = models.ForeignKey(Event, related_name='notes', on_delete=models.CASCADE, blank=True, null=True)
- profile = models.ForeignKey(Profile, related_name='notes', on_delete=models.CASCADE, blank=True, null=True)
+ event = models.ForeignKey(
+ Event, related_name='notes', on_delete=models.CASCADE, blank=True, null=True)
+ profile = models.ForeignKey(
+ Profile, related_name='notes', on_delete=models.CASCADE, blank=True, null=True)
note = models.TextField()
created_by = models.ForeignKey(
Profile,
diff --git a/src/stats/resources.py b/src/stats/resources.py
index 712c971..b2e284c 100644
--- a/src/stats/resources.py
+++ b/src/stats/resources.py
@@ -7,7 +7,8 @@ from . import models
class EventResource(resources.ModelResource):
visitors = fields.Field(
attribute='visitors',
- widget=widgets.ManyToManyWidget(model=Profile, separator=' ,', field='full_name'),
+ widget=widgets.ManyToManyWidget(
+ model=Profile, separator=' ,', field='full_name'),
)
class Meta:
diff --git a/src/stats/urls.py b/src/stats/urls.py
index 0e669f8..51ed161 100644
--- a/src/stats/urls.py
+++ b/src/stats/urls.py
@@ -2,8 +2,10 @@ from rest_framework import routers
from . import views
router = routers.DefaultRouter()
-router.register(r'staff_events', views.StaffEventViewSet, base_name='staff_events')
-router.register(r'student_events', views.StudentEventViewSet, base_name='student_events')
+router.register(r'staff_events', views.StaffEventViewSet,
+ base_name='staff_events')
+router.register(r'student_events', views.StudentEventViewSet,
+ base_name='student_events')
router.register(r'notes', views.NoteViewSet, base_name='notes')
urlpatterns = router.urls
--
GitLab