Skip to content

Commit 351a2ea

Browse files
author
Bojan Jovanovic
committed
year is unique, and we now allow historical years
1 parent 0365e93 commit 351a2ea

File tree

4 files changed

+39
-9
lines changed

4 files changed

+39
-9
lines changed

pyconbalkan/conference/middleware.py

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,12 @@ def __call__(self, request):
2424
domain = request.META.get('HTTP_HOST', 'localhost')
2525
try:
2626
domain_year = int(domain.split('.')[0])
27-
q = {
28-
"year": domain_year
29-
}
30-
if not request.user.is_superuser:
31-
q['active'] = True
32-
33-
request.conference = Conference.objects.get(**q)
27+
request.conference = Conference.objects.get(year=domain_year)
3428
except (Conference.DoesNotExist, ValueError):
3529
request.conference = Conference.objects.filter(active=True).first()
3630
if not request.conference:
3731
return self.get_response(request)
3832

39-
4033
conference_domain = "{}.{}".format(
4134
request.conference.year,
4235
settings.META_SITE_DOMAIN
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Generated by Django 2.1.7 on 2019-02-27 07:38
2+
3+
from django.db import migrations, models
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
('conference', '0006_conference_timetable_pdf'),
10+
]
11+
12+
operations = [
13+
migrations.AlterField(
14+
model_name='conference',
15+
name='year',
16+
field=models.PositiveIntegerField(unique=True),
17+
),
18+
]

pyconbalkan/conference/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class Conference(SingleActiveModel, ModelMeta):
1616

1717
event = models.CharField(null=True, blank=True, max_length=100)
1818
name = models.CharField(null=True, blank=True, max_length=100)
19-
year = models.PositiveIntegerField()
19+
year = models.PositiveIntegerField(unique=True)
2020
number = models.PositiveIntegerField()
2121
city = models.CharField(null=True, blank=True, max_length=200)
2222
country = CountryField(null=True, blank=True)
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Generated by Django 2.1.7 on 2019-02-27 07:38
2+
3+
from django.db import migrations
4+
import markdownx.models
5+
6+
7+
class Migration(migrations.Migration):
8+
9+
dependencies = [
10+
('faq', '0001_initial'),
11+
]
12+
13+
operations = [
14+
migrations.AlterField(
15+
model_name='faq',
16+
name='answer',
17+
field=markdownx.models.MarkdownxField(blank=True, null=True),
18+
),
19+
]

0 commit comments

Comments
 (0)