Move xnet/accounts to xnet/groups

[xnet] / xnet / news / models.py

diff --git a/xnet/news/models.py b/xnet/news/models.py
index 221d979..2a13290 100644 (file)
--- a/xnet/news/models.py
+++ b/xnet/news/models.py
@@ -3,27 +3,28 @@
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 
+from xnet.accounts import models as accounts_models
+from xnet.groups import models as groups_models
+
+from xnet.utils.images.fields import ImageWithThumbsField
 
 class News(models.Model):
 
     title = models.CharField(max_length=200, verbose_name=u"titre")
     content = models.TextField(verbose_name=u"contenu")
     contacts = models.TextField(verbose_name=u"contacts", blank=True)
-    illustration = models.ImageField(upload_to='blah', verbose_name=u"illustration", null=True, blank=True)
+    illustration = ImageWithThumbsField(upload_to='news', verbose_name=u"illustration", null=True, blank=True)
     expiration = models.DateField(verbose_name=u"date de péremption")
     
-# TODO : attached_event = null
+    attached_event = models.ForeignKey('events.Event', related_name='news', null=True, blank=True)
     
     restricted = models.BooleanField(default=True, verbose_name=u"visibilité restreinte")
-    promo_min = models.PositiveSmallIntegerField(verbose_name=u"promotion la plus ancienne", null=True, blank=True)
-    promo_max = models.PositiveSmallIntegerField(verbose_name=u"promotion la plus jeune", null=True, blank=True)
     
-    author = models.ForeignKey('accounts.Account', related_name='+')
-    group = models.ForeignKey('accounts.XGroup', related_name='news')
+    author = models.ForeignKey(accounts_models.Account, related_name='+', verbose_name=u"auteur")
+    group = models.ForeignKey(groups_models.XGroup, related_name='news', verbose_name=u"groupe associé")
 
     class Meta:
-        verbose_name = _(u"news")
-        verbose_name_plural = _(u"news")
+        verbose_name = u"annonce"
 
     def __unicode__(self):
         return self.title