From 552b27ba2bc752b102681596b7cec9b9ed1c2aa1 Mon Sep 17 00:00:00 2001 From: Ramon Wenger Date: Mon, 27 Aug 2018 18:18:09 +0200 Subject: [PATCH] Add related name to objective groups --- client/src/components/modules/Module.vue | 2 +- client/src/graphql/gql/moduleDetailsQuery.gql | 2 +- client/src/pages/module.vue | 2 +- server/book/schema.py | 2 +- .../migrations/0003_auto_20180827_1617.py | 19 +++++++++++++++++++ server/objectives/models.py | 2 +- 6 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 server/objectives/migrations/0003_auto_20180827_1617.py diff --git a/client/src/components/modules/Module.vue b/client/src/components/modules/Module.vue index c0f480c6..089ac139 100644 --- a/client/src/components/modules/Module.vue +++ b/client/src/components/modules/Module.vue @@ -10,7 +10,7 @@

Lernziele

- + diff --git a/client/src/graphql/gql/moduleDetailsQuery.gql b/client/src/graphql/gql/moduleDetailsQuery.gql index 948ef75c..7a9c6f05 100644 --- a/client/src/graphql/gql/moduleDetailsQuery.gql +++ b/client/src/graphql/gql/moduleDetailsQuery.gql @@ -8,7 +8,7 @@ query ModulesQuery($slug: String!) { metaTitle teaser intro - objectivegroupSet { + objectiveGroups { edges { node { id diff --git a/client/src/pages/module.vue b/client/src/pages/module.vue index 1317522f..e3615d11 100644 --- a/client/src/pages/module.vue +++ b/client/src/pages/module.vue @@ -38,7 +38,7 @@ data() { return { module: { - objectivegroupSet: { + objectiveGroups: { edges: {} }, chapters: { diff --git a/server/book/schema.py b/server/book/schema.py index 0707bbce..0497cb15 100644 --- a/server/book/schema.py +++ b/server/book/schema.py @@ -43,7 +43,7 @@ class ModuleType(DjangoObjectType): class Meta: model = Module only_fields = [ - 'slug', 'title', 'meta_title', 'teaser', 'intro', 'objectivegroup_set' + 'slug', 'title', 'meta_title', 'teaser', 'intro', 'objective_groups' ] filter_fields = { 'slug': ['exact', 'icontains', 'in'], diff --git a/server/objectives/migrations/0003_auto_20180827_1617.py b/server/objectives/migrations/0003_auto_20180827_1617.py new file mode 100644 index 00000000..0945517e --- /dev/null +++ b/server/objectives/migrations/0003_auto_20180827_1617.py @@ -0,0 +1,19 @@ +# Generated by Django 2.0.6 on 2018-08-27 16:17 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('objectives', '0002_auto_20180823_1148'), + ] + + operations = [ + migrations.AlterField( + model_name='objectivegroup', + name='module', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='objective_groups', to='book.Module'), + ), + ] diff --git a/server/objectives/models.py b/server/objectives/models.py index 421c94ba..cac1738c 100644 --- a/server/objectives/models.py +++ b/server/objectives/models.py @@ -11,7 +11,7 @@ class ObjectiveGroup(models.Model): verbose_name_plural = 'Lernziel Gruppen' title = models.CharField('title', blank=True, null=False, max_length=255) - module = models.ForeignKey(Module, blank=False, null=False, on_delete=models.CASCADE) + module = models.ForeignKey(Module, blank=False, null=False, on_delete=models.CASCADE, related_name='objective_groups') # a user can define her own objectives, hence this optional param user = models.ForeignKey(get_user_model(), blank=True, null=True, on_delete=models.CASCADE)