klmp200
/
Sith
mirror of https://github.com/ae-utbm/sith3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pedagogy: fix typo for AUTUMN_AND_SPRING

This commit is contained in:
Antoine Bartuccio 2019-07-05 16:40:02 +02:00
parent 205f93569a
commit 3376f4dfb4
Signed by: klmp200
GPG Key ID: E7245548C53F904B
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
migrate.py
View File

@ -1578,7 +1578,7 @@ def migrate_pedagogy():
"closed": "CLOSED", "closed": "CLOSED",
"A": "AUTUMN", "A": "AUTUMN",
"P": "SPRING", "P": "SPRING",
"AP": "AUTOMN_AND_SPRING", "AP": "AUTUMN_AND_SPRING",
} }
def department_conversion(department): def department_conversion(department):

4
pedagogy/migrations/0001_initial.py
View File

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Generated by Django 1.11.20 on 2019-06-19 23:05 # Generated by Django 1.11.20 on 2019-07-05 14:32
from __future__ import unicode_literals from __future__ import unicode_literals
from django.conf import settings from django.conf import settings
@ -67,7 +67,7 @@ class Migration(migrations.Migration):
("CLOSED", "Closed"), ("CLOSED", "Closed"),
("AUTUMN", "Autumn"), ("AUTUMN", "Autumn"),
("SPRING", "Spring"), ("SPRING", "Spring"),
("AUTOMN_AND_SPRING", "Autumn and spring"), ("AUTUMN_AND_SPRING", "Autumn and spring"),
], ],
default="CLOSED", default="CLOSED",
max_length=20, max_length=20,

4
pedagogy/tests.py
View File

@ -632,7 +632,7 @@ class UVSearchTest(TestCase):
self.assertContains(response, text="PA00") self.assertContains(response, text="PA00")
response = self.client.get( response = self.client.get(
reverse("pedagogy:guide"), {"semester": "AUTOMN_AND_SPRING"} reverse("pedagogy:guide"), {"semester": "AUTUMN_AND_SPRING"}
) )
self.assertContains(response, text="PA00") self.assertContains(response, text="PA00")
@ -679,7 +679,7 @@ class UVSearchTest(TestCase):
"code": "PA00", "code": "PA00",
"author": 0, "author": 0,
"credit_type": "OM", "credit_type": "OM",
"semester": "AUTOMN_AND_SPRING", "semester": "AUTUMN_AND_SPRING",
"language": "FR", "language": "FR",
"credits": 5, "credits": 5,
"department": "HUMA", "department": "HUMA",

2
pedagogy/views.py
View File

@ -184,7 +184,7 @@ class UVListView(CanViewMixin, CanCreateUVFunctionMixin, ListView):
semester = self.request.GET.get("semester", None) semester = self.request.GET.get("semester", None)
if semester: if semester:
if semester in ["AUTUMN", "SPRING"]: if semester in ["AUTUMN", "SPRING"]:
additional_filters["semester__in"] = [semester, "AUTOMN_AND_SPRING"] additional_filters["semester__in"] = [semester, "AUTUMN_AND_SPRING"]
else: else:
additional_filters["semester"] = semester additional_filters["semester"] = semester

2
sith/settings.py
View File

@ -421,7 +421,7 @@ SITH_PEDAGOGY_UV_SEMESTER = [
("CLOSED", _("Closed")), ("CLOSED", _("Closed")),
("AUTUMN", _("Autumn")), ("AUTUMN", _("Autumn")),
("SPRING", _("Spring")), ("SPRING", _("Spring")),
("AUTOMN_AND_SPRING", _("Autumn and spring")), ("AUTUMN_AND_SPRING", _("Autumn and spring")),
] ]
SITH_PEDAGOGY_UV_LANGUAGE = [ SITH_PEDAGOGY_UV_LANGUAGE = [