X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=xnet%2Fgroups%2Fmodels.py;h=ab4bc95aff1e5c833fd8cb3621dab1b71e08c0b7;hb=e219bad0593d7d012b609164d67e256042ef7cbe;hp=e275c1878b73adcb2b60dab016f0f4aaad436e30;hpb=29cda05d33e1e6daffbdc548a96209269a3cf74d;p=xnet

diff --git a/xnet/groups/models.py b/xnet/groups/models.py
index e275c18..ab4bc95 100644
--- a/xnet/groups/models.py
+++ b/xnet/groups/models.py
@@ -86,7 +86,7 @@ class Membership(xwf_models.WorkflowEnabled, models.Model):
     )
 
     xgroup = models.ForeignKey(XGroup, related_name='memberships', verbose_name=u"groupe")
-    xuser = models.ForeignKey(accounts_models.Account, related_name='memberships', verbose_name=u"utilisateur")
+    user = models.ForeignKey(accounts_models.Account, related_name='memberships', verbose_name=u"utilisateur")
 
     level = models.IntegerField(choices=LEVEL_CHOICES, default=LEVEL_MEMBER, verbose_name=u"droits")
     state = xwf_models.StateField(MembershipWorkflow, verbose_name=u"état")
@@ -94,7 +94,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']
+        unique_together = ['xgroup', 'user']
 
     def __unicode__(self):
-        return u"{} {} de {} [{}]".format(self.xuser, self.get_level_display(), self.xgroup, self.state)
+        return u"{} {} de {} [{}]".format(self.user, self.get_level_display(), self.xgroup, self.state)