Commit 3bbc1990 by Bessie Steinberg Committed by Matt Tuchfarber

Add applicable seat types to Journal Bundle model

- Add 'applicable seat types' for courses to journal bundle model
- Set journal bundle get api to return list of applicable_seat_types
parent a5c0513d
......@@ -24,5 +24,6 @@ class JournalBundleAdmin(admin.ModelAdmin):
raw_id_fields = (
'partner',
'journals',
'courses'
'courses',
'applicable_seat_types'
)
......@@ -29,6 +29,7 @@ class JournalBundleSerializer(serializers.ModelSerializer):
courses = MinimalCourseSerializer(many=True, read_only=True)
journals = JournalSerializer(many=True, read_only=True)
partner = serializers.SlugRelatedField(slug_field='name', read_only=True)
applicable_seat_types = serializers.SlugRelatedField(slug_field='slug', read_only=True, many=True)
class Meta:
model = JournalBundle
......@@ -37,5 +38,6 @@ class JournalBundleSerializer(serializers.ModelSerializer):
'title',
'partner',
'journals',
'courses'
'courses',
'applicable_seat_types'
)
# -*- coding: utf-8 -*-
# Generated by Django 1.11.11 on 2018-04-02 21:00
from __future__ import unicode_literals
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('journal', '0005_auto_20180329_2009'),
]
operations = [
migrations.AlterModelOptions(
name='journal',
options={'ordering': ('created',)},
),
]
# -*- coding: utf-8 -*-
# Generated by Django 1.11.11 on 2018-04-03 22:45
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('course_metadata', '0081_auto_20180329_0718'),
('journal', '0006_auto_20180402_2100'),
]
operations = [
migrations.AddField(
model_name='journalbundle',
name='applicable_seat_types',
field=models.ManyToManyField(blank=True, to='course_metadata.SeatType'),
),
]
......@@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _
from uuid import uuid4
from course_discovery.apps.core.models import Currency, Partner
from course_discovery.apps.course_metadata.models import Course, Organization
from course_discovery.apps.course_metadata.models import Course, Organization, SeatType
CHARFIELD_MAX_LENGTH = 255
......@@ -67,6 +67,7 @@ class JournalBundle(TimeStampedModel):
partner = models.ForeignKey(Partner)
journals = models.ManyToManyField(Journal, blank=True)
courses = models.ManyToManyField(Course, blank=True)
applicable_seat_types = models.ManyToManyField(SeatType, blank=True)
def __str__(self):
return self.title
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