Skip to content
Snippets Groups Projects
Commit de3a3d4e authored by Benoit Alessandroni's avatar Benoit Alessandroni
Browse files

Merge branch 'update/adding-polls-author' into 'master'

update: adding author reference to poll

See merge request !21
parents ede9de3c 6ef489db
No related branches found
No related tags found
1 merge request!21update: adding author reference to poll
Pipeline #9462 passed
# Generated by Django 2.2.16 on 2021-01-11 21:25
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('djangoldp_polls', '0011_auto_20200923_1355'),
]
operations = [
migrations.AlterField(
model_name='poll',
name='author',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='polls', to=settings.AUTH_USER_MODEL),
),
]
...@@ -42,7 +42,7 @@ class PollOption (Model): ...@@ -42,7 +42,7 @@ class PollOption (Model):
class Poll (Model): class Poll (Model):
created_at = models.DateTimeField(auto_now_add=True) created_at = models.DateTimeField(auto_now_add=True)
author = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='createdVotes', null=True, blank=True, on_delete=models.SET_NULL) author = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='polls', null=True, blank=True, on_delete=models.SET_NULL)
title = models.CharField(max_length=250,verbose_name="Title") title = models.CharField(max_length=250,verbose_name="Title")
image = models.URLField(verbose_name="Illustration",default=settings.BASE_URL +"/media/defaultpoll.png") image = models.URLField(verbose_name="Illustration",default=settings.BASE_URL +"/media/defaultpoll.png")
hostingOrganisation = models.CharField(max_length=250,verbose_name="Name of the hosting organisation") hostingOrganisation = models.CharField(max_length=250,verbose_name="Name of the hosting organisation")
...@@ -56,11 +56,14 @@ class Poll (Model): ...@@ -56,11 +56,14 @@ class Poll (Model):
circle = models.ForeignKey(Circle, null=True, related_name="polls", on_delete=models.SET_NULL) circle = models.ForeignKey(Circle, null=True, related_name="polls", on_delete=models.SET_NULL)
class Meta(Model.Meta): class Meta(Model.Meta):
auto_author = 'author'
owner_field = 'author'
serializer_fields = ['@id','created_at','debate','pollOptions','votes','author','title','image','circle',\ serializer_fields = ['@id','created_at','debate','pollOptions','votes','author','title','image','circle',\
'hostingOrganisation','startDate','endDate','shortDescription','longDescription','tags'] 'hostingOrganisation','startDate','endDate','shortDescription','longDescription','tags']
nested_fields = ['tags','votes','pollOptions','debate','circle'] nested_fields = ['tags','votes','pollOptions','debate','circle']
anonymous_perms = ['view','add','change'] anonymous_perms = ['view','add','change']
authenticated_perms = ['inherit','add'] authenticated_perms = ['inherit','add']
owner_perms = ['inherit', 'change', 'control', 'delete']
def __str__(self): def __str__(self):
return self.title return self.title
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment