group_required decorator

[xnet] / xnet / accounts / models.py

diff --git a/xnet/accounts/models.py b/xnet/accounts/models.py
index 3e0f9c3..6308429 100644 (file)
--- a/xnet/accounts/models.py
+++ b/xnet/accounts/models.py
@@ -5,6 +5,8 @@ from django.db import models
 
 from django_xworkflows import models as xwf_models
 
+from xnet.utils.images.fields import ImageWithThumbsField as ImageField
+
 
 class MembershipWorkflow(xwf_models.Workflow):
     states = (
@@ -60,6 +62,11 @@ class XGroup(models.Model):
 
     dns = models.CharField(max_length=128, verbose_name=u"dns domain", blank=True)
 
+    web = models.CharField(max_length=255, verbose_name=u"website", blank=True)
+    #contact = models.ForeignKey('')
+    description = models.TextField()
+    logo = ImageField(upload_to='logos', null=True, blank=True)
+
     class Meta:
         verbose_name = u"groupe"
         verbose_name_plural = u"groupes"
@@ -97,6 +104,7 @@ class Membership(xwf_models.WorkflowEnabled, models.Model):
     class Meta:
         verbose_name = u"adhérent"
         verbose_name_plural = u"adhérents"
+        unique_together = ['xgroup', 'xuser']
 
     def __unicode__(self):
-        return self.name
+        return u"{} {} de {} [{}]".format(self.xuser, dict(Membership.LEVEL_CHOICES)[self.level], self.xgroup, self.state)