Better management of manually-set members.

[wolnelektury.git] / src / polls / models.py

diff --git a/src/polls/models.py b/src/polls/models.py
index bfc3639..2785f35 100644 (file)
--- a/src/polls/models.py
+++ b/src/polls/models.py
@@ -1,11 +1,10 @@
-# -*- coding: utf-8 -*-

 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 from django.core.exceptions import ValidationError
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 from django.core.exceptions import ValidationError

-from django.core.urlresolvers import reverse
+from django.urls import reverse

 
 
 USED_POLLS_KEY = 'used_polls'
 
 
 USED_POLLS_KEY = 'used_polls'


@@ -26,7 +25,7 @@ class Poll(models.Model):
             raise ValidationError(_('Slug of an open poll needs to be unique'))
         return super(Poll, self).clean()
 
             raise ValidationError(_('Slug of an open poll needs to be unique'))
         return super(Poll, self).clean()
 

-    def __unicode__(self):
+    def __str__(self):

         return self.question[:100] + ' (' + self.slug + ')'
 
     def get_absolute_url(self):
         return self.question[:100] + ' (' + self.slug + ')'
 
     def get_absolute_url(self):


@@ -42,7 +41,7 @@ class Poll(models.Model):
 
 class PollItem(models.Model):
 
 
 class PollItem(models.Model):
 

-    poll = models.ForeignKey(Poll, related_name='items')
+    poll = models.ForeignKey(Poll, models.CASCADE, related_name='items')

     content = models.TextField(_('content'))
     vote_count = models.IntegerField(_('vote count'), default=0)
 
     content = models.TextField(_('content'))
     vote_count = models.IntegerField(_('vote count'), default=0)
 


@@ -50,8 +49,8 @@ class PollItem(models.Model):
         verbose_name = _('vote item')
         verbose_name_plural = _('vote items')
 
         verbose_name = _('vote item')
         verbose_name_plural = _('vote items')
 

-    def __unicode__(self):
-        return self.content + ' @ ' + unicode(self.poll)
+    def __str__(self):
+        return self.content + ' @ ' + str(self.poll)

 
     @property
     def vote_ratio(self):
 
     @property
     def vote_ratio(self):