From ede607cb66dcac873ae1b92492cd6e7f5bfb2fb3 Mon Sep 17 00:00:00 2001 From: senza <maximesenzamici@gmail.com> Date: Mon, 10 Aug 2020 12:40:20 +0200 Subject: [PATCH] allow polls to be linked to circles --- .../migrations/0002_poll_circle.py | 22 +++++++++++++++++++ djangoldp_polls/models.py | 3 ++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 djangoldp_polls/migrations/0002_poll_circle.py diff --git a/djangoldp_polls/migrations/0002_poll_circle.py b/djangoldp_polls/migrations/0002_poll_circle.py new file mode 100644 index 0000000..55bd116 --- /dev/null +++ b/djangoldp_polls/migrations/0002_poll_circle.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.29 on 2020-08-07 14:13 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('djangoldp_circle', '0009_auto_20200807_1413'), + ('djangoldp_polls', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='poll', + name='circle', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='resources', to='djangoldp_circle.Circle'), + ), + ] diff --git a/djangoldp_polls/models.py b/djangoldp_polls/models.py index f57691e..96f5518 100644 --- a/djangoldp_polls/models.py +++ b/djangoldp_polls/models.py @@ -6,6 +6,7 @@ from django.contrib.auth import get_user_model from django.db.models import Sum from djangoldp_conversation.models import Conversation +from djangoldp_circle.models import Circle User = get_user_model() User.name=User.get_full_name @@ -54,7 +55,7 @@ class Poll (Model): tags = models.ManyToManyField(Tag, related_name='tags', blank=True) pollOptions = models.ManyToManyField(PollOption, related_name='relatedPollOptions', blank=True) debate = models.ManyToManyField(Conversation, related_name='debates', blank=True) - #relatedVotes = models.ManyToManyField(Vote, related_name='relatedVotes', blank=True) + circle = models.ForeignKey(Circle, null=True, related_name="resources") class Meta : serializer_fields = ['@id','created_at','debate','pollOptions','votes','author','title','image','hostingOrganisation','startDate','endDate','shortDescription','longDescription','tags'] -- GitLab