Rename Membership.xuser to Membership.user

[xnet] / xnet / groups / models.py

diff --git a/xnet/groups/models.py b/xnet/groups/models.py
index e275c18..ab4bc95 100644 (file)
--- 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)