Skip to content

Commit e3b06cf

Browse files
sks444sks444
committed
Lint the code
1 parent cd19469 commit e3b06cf

File tree

6 files changed

+88
-39
lines changed

6 files changed

+88
-39
lines changed

‎junction/conferences/migrations/0016_auto_20200410_1926.py

+26-10
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,47 @@
22
# Generated by Django 1.11.17 on 2020-04-10 13:56
33
from __future__ import unicode_literals
44

5+
import django.db.models.deletion
56
from django.conf import settings
67
from django.db import migrations, models
7-
import django.db.models.deletion
88

99

1010
class Migration(migrations.Migration):
1111

1212
dependencies = [
13-
('conferences', '0015_auto_20200322_1904'),
13+
("conferences", "0015_auto_20200322_1904"),
1414
]
1515

1616
operations = [
1717
migrations.AddField(
18-
model_name='historicalconferenceproposalreviewer',
19-
name='history_change_reason',
18+
model_name="historicalconferenceproposalreviewer",
19+
name="history_change_reason",
2020
field=models.CharField(max_length=100, null=True),
2121
),
2222
migrations.AlterField(
23-
model_name='historicalconferenceproposalreviewer',
24-
name='created_by',
25-
field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to=settings.AUTH_USER_MODEL, verbose_name='Created By'),
23+
model_name="historicalconferenceproposalreviewer",
24+
name="created_by",
25+
field=models.ForeignKey(
26+
blank=True,
27+
db_constraint=False,
28+
null=True,
29+
on_delete=django.db.models.deletion.DO_NOTHING,
30+
related_name="+",
31+
to=settings.AUTH_USER_MODEL,
32+
verbose_name="Created By",
33+
),
2634
),
2735
migrations.AlterField(
28-
model_name='historicalconferenceproposalreviewer',
29-
name='modified_by',
30-
field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to=settings.AUTH_USER_MODEL, verbose_name='Modified By'),
36+
model_name="historicalconferenceproposalreviewer",
37+
name="modified_by",
38+
field=models.ForeignKey(
39+
blank=True,
40+
db_constraint=False,
41+
null=True,
42+
on_delete=django.db.models.deletion.DO_NOTHING,
43+
related_name="+",
44+
to=settings.AUTH_USER_MODEL,
45+
verbose_name="Modified By",
46+
),
3147
),
3248
]

‎junction/conferences/views.py

-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
from django.http.response import HttpResponseRedirect
66
from django.shortcuts import get_object_or_404
77
from django.views.decorators.http import require_http_methods
8-
98
from django_filters import rest_framework as filters
10-
119
from rest_framework import viewsets
1210

1311
from .models import Conference, ConferenceVenue, Room

‎junction/devices/migrations/0001_initial.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class Migration(migrations.Migration):
3333
auto_now=True, verbose_name="Last Modified At"
3434
),
3535
),
36-
('uuid', models.UUIDField(max_length=32, unique=True, db_index=True)),
36+
("uuid", models.UUIDField(max_length=32, unique=True, db_index=True)),
3737
("is_verified", models.BooleanField(default=False)),
3838
("verification_code", models.IntegerField()),
3939
(

‎junction/proposals/migrations/0028_auto_20200507_1202.py

+53-21
Original file line numberDiff line numberDiff line change
@@ -2,51 +2,83 @@
22
# Generated by Django 1.11.17 on 2020-05-07 06:32
33
from __future__ import unicode_literals
44

5+
import django.db.models.deletion
56
from django.conf import settings
67
from django.db import migrations, models
7-
import django.db.models.deletion
88

99

1010
class Migration(migrations.Migration):
1111

1212
dependencies = [
13-
('proposals', '0027_auto_20200502_0540'),
13+
("proposals", "0027_auto_20200502_0540"),
1414
]
1515

1616
operations = [
1717
migrations.AddField(
18-
model_name='historicalproposal',
19-
name='history_change_reason',
18+
model_name="historicalproposal",
19+
name="history_change_reason",
2020
field=models.CharField(max_length=100, null=True),
2121
),
2222
migrations.AddField(
23-
model_name='historicalproposalsectionreviewervote',
24-
name='history_change_reason',
23+
model_name="historicalproposalsectionreviewervote",
24+
name="history_change_reason",
2525
field=models.CharField(max_length=100, null=True),
2626
),
2727
migrations.AlterField(
28-
model_name='historicalproposal',
29-
name='author',
30-
field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to=settings.AUTH_USER_MODEL, verbose_name='Primary Speaker'),
28+
model_name="historicalproposal",
29+
name="author",
30+
field=models.ForeignKey(
31+
blank=True,
32+
db_constraint=False,
33+
null=True,
34+
on_delete=django.db.models.deletion.DO_NOTHING,
35+
related_name="+",
36+
to=settings.AUTH_USER_MODEL,
37+
verbose_name="Primary Speaker",
38+
),
3139
),
3240
migrations.AlterField(
33-
model_name='historicalproposal',
34-
name='proposal_section',
35-
field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='proposals.ProposalSection', verbose_name='Proposal Section'),
41+
model_name="historicalproposal",
42+
name="proposal_section",
43+
field=models.ForeignKey(
44+
blank=True,
45+
db_constraint=False,
46+
null=True,
47+
on_delete=django.db.models.deletion.DO_NOTHING,
48+
related_name="+",
49+
to="proposals.ProposalSection",
50+
verbose_name="Proposal Section",
51+
),
3652
),
3753
migrations.AlterField(
38-
model_name='historicalproposal',
39-
name='proposal_type',
40-
field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='proposals.ProposalType', verbose_name='Proposal Type'),
54+
model_name="historicalproposal",
55+
name="proposal_type",
56+
field=models.ForeignKey(
57+
blank=True,
58+
db_constraint=False,
59+
null=True,
60+
on_delete=django.db.models.deletion.DO_NOTHING,
61+
related_name="+",
62+
to="proposals.ProposalType",
63+
verbose_name="Proposal Type",
64+
),
4165
),
4266
migrations.AlterField(
43-
model_name='historicalproposal',
44-
name='video_url',
45-
field=models.URLField(blank=True, default='', help_text='Short 1-2 min video describing your talk'),
67+
model_name="historicalproposal",
68+
name="video_url",
69+
field=models.URLField(
70+
blank=True,
71+
default="",
72+
help_text="Short 1-2 min video describing your talk",
73+
),
4674
),
4775
migrations.AlterField(
48-
model_name='proposal',
49-
name='video_url',
50-
field=models.URLField(blank=True, default='', help_text='Short 1-2 min video describing your talk'),
76+
model_name="proposal",
77+
name="video_url",
78+
field=models.URLField(
79+
blank=True,
80+
default="",
81+
help_text="Short 1-2 min video describing your talk",
82+
),
5183
),
5284
]

‎junction/proposals/views.py

+7-3
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,11 @@
1111
from django.http.response import HttpResponse, HttpResponseRedirect
1212
from django.shortcuts import get_object_or_404, render
1313
from django.views.decorators.http import require_http_methods
14+
from django_filters import rest_framework as filters
1415
from hashids import Hashids
1516
from rest_framework import viewsets
1617
from rest_framework.response import Response
1718

18-
from django_filters import rest_framework as filters
19-
2019
from junction.base.constants import (
2120
ConferenceSettingConstants,
2221
ConferenceStatus,
@@ -41,7 +40,12 @@ class ProposalView(viewsets.ReadOnlyModelViewSet):
4140
queryset = Proposal.objects.filter(status=2)
4241
serializer_class = serializers.ProposalSerializer
4342
filter_backend = (filters.DjangoFilterBackend,)
44-
filterset_fields = ("conference", "review_status", "proposal_type", "proposal_section")
43+
filterset_fields = (
44+
"conference",
45+
"review_status",
46+
"proposal_type",
47+
"proposal_section",
48+
)
4549

4650
def get_queryset(self):
4751
data = super(ProposalView, self).get_queryset()

‎junction/schedule/views.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@
66
from django.http import HttpResponse
77
from django.shortcuts import Http404, render
88
from django.template.loader import render_to_string
9+
from django_filters import rest_framework as filters
910
from rest_framework import viewsets
1011
from rest_framework.response import Response
1112

12-
from django_filters import rest_framework as filters
13-
1413
from .models import ScheduleItem
1514
from .serializers import ScheduleSerializer
1615

0 commit comments

Comments
 (0)