From a5070b009d062289850a758150ccd82d446218f6 Mon Sep 17 00:00:00 2001 From: Oscar Carballal Prego Date: Fri, 21 Dec 2012 11:37:11 +0100 Subject: [PATCH] Minor fixes --- src/apps/ecidadania/proposals/models.py | 4 ++-- src/apps/ecidadania/voting/models.py | 2 +- src/e_cidadania/settings/defaults.py | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/apps/ecidadania/proposals/models.py b/src/apps/ecidadania/proposals/models.py index 2e3b2b2e..a379579c 100755 --- a/src/apps/ecidadania/proposals/models.py +++ b/src/apps/ecidadania/proposals/models.py @@ -172,8 +172,8 @@ class Proposal(BaseProposalAbstractModel): anon_allowed = models.NullBooleanField(default=False, blank=True) support_votes = models.ManyToManyField(User, null=True, blank=True, verbose_name=_('Support votes from')) - votes = models.ManyToManyField(User, verbose_name=_('Votes from') - null=True, blank=True) + votes = models.ManyToManyField(User, verbose_name=_('Votes from'), + null=True, blank=True) refurbished = models.NullBooleanField(default=False, blank=True) budget = models.IntegerField(blank=True, null=True) diff --git a/src/apps/ecidadania/voting/models.py b/src/apps/ecidadania/voting/models.py index e5ac9987..ee82ca1d 100755 --- a/src/apps/ecidadania/voting/models.py +++ b/src/apps/ecidadania/voting/models.py @@ -98,7 +98,7 @@ class Voting(models.Model): author = models.ForeignKey(User, blank=True, null=True) start_date = models.DateField(_('Start date'), blank=True, null=True) end_date = models.DateField(_('End date'), blank=True, null=True) - ponderation = model.CharField(_('Ponderation'), null=True, blank=True, + ponderation = models.CharField(_('Ponderation'), null=True, blank=True, choices=PONDERATIONS) proposalsets = models.ManyToManyField(ProposalSet, blank=True, null=True) diff --git a/src/e_cidadania/settings/defaults.py b/src/e_cidadania/settings/defaults.py index 9b10ec03..27f7a841 100644 --- a/src/e_cidadania/settings/defaults.py +++ b/src/e_cidadania/settings/defaults.py @@ -141,6 +141,7 @@ DJANGO_APPS = ( 'django.contrib.comments', 'django.contrib.admin', 'django.contrib.comments', + 'south', ) # Stablish message storage -- 2.11.4.GIT