Commit 5cdb48f0 authored by Luko van der Maas's avatar Luko van der Maas
Browse files

Merge branch 'tc/remove-education-fields' into 'master'

Remove shorthand and period from education Course model

Closes #896

See merge request !1319
parents 28777ac0 fe7ffdf0
...@@ -16,8 +16,8 @@ admin.site.register(models.Category) ...@@ -16,8 +16,8 @@ admin.site.register(models.Category)
@admin.register(models.Course) @admin.register(models.Course)
class CourseAdmin(TranslatedModelAdmin): class CourseAdmin(TranslatedModelAdmin):
fields = ('name', 'shorthand', 'course_code', 'ec', 'since', 'until', fields = ('name', 'course_code', 'ec', 'since', 'until', 'categories',
'period', 'categories', 'old_courses') 'old_courses')
list_filter = ('categories', 'ec') list_filter = ('categories', 'ec')
search_fields = ('name', 'course_code') search_fields = ('name', 'course_code')
......
# Generated by Django 2.2.1 on 2019-08-03 16:57
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('education', '0010_auto_20190130_2048'),
]
operations = [
migrations.RemoveField(
model_name='course',
name='period',
),
migrations.RemoveField(
model_name='course',
name='shorthand_en',
),
migrations.RemoveField(
model_name='course',
name='shorthand_nl',
),
]
...@@ -48,11 +48,6 @@ class Course(models.Model, metaclass=ModelTranslateMeta): ...@@ -48,11 +48,6 @@ class Course(models.Model, metaclass=ModelTranslateMeta):
blank=True blank=True
) )
shorthand = MultilingualField(
models.CharField,
max_length=10
)
course_code = models.CharField( course_code = models.CharField(
max_length=16 max_length=16
) )
...@@ -66,11 +61,6 @@ class Course(models.Model, metaclass=ModelTranslateMeta): ...@@ -66,11 +61,6 @@ class Course(models.Model, metaclass=ModelTranslateMeta):
blank=True, null=True blank=True, null=True
) )
period = models.CharField(
max_length=64,
verbose_name=_('period'),
)
def __str__(self): def __str__(self):
return "{} ({})".format(self.name, self.course_code) return "{} ({})".format(self.name, self.course_code)
......
...@@ -120,10 +120,6 @@ ...@@ -120,10 +120,6 @@
<li><strong>{% trans "EC" %}: </strong> <li><strong>{% trans "EC" %}: </strong>
{{ course.ec }} {{ course.ec }}
</li> </li>
<li>
<strong>{% trans "Period" %}: </strong>
{{ course.period }}
</li>
</ul> </ul>
{% if request.user.is_authenticated %} {% if request.user.is_authenticated %}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment