From: Raphaël Barrois <raphael.barrois@polyconseil.fr>
Date: Fri, 29 Mar 2013 23:13:10 +0000 (+0100)
Subject: Rename Membership.xuser to Membership.user
X-Git-Url: http://git.polytechnique.org/?p=xnet;a=commitdiff_plain;h=e219bad0593d7d012b609164d67e256042ef7cbe

Rename Membership.xuser to Membership.user
---

diff --git a/xnet/groups/admin.py b/xnet/groups/admin.py
index 81e229b..072a6e9 100644
--- a/xnet/groups/admin.py
+++ b/xnet/groups/admin.py
@@ -13,7 +13,7 @@ admin.site.register(models.XGroup, XGroupAdmin)
 
 
 class MembershipAdmin(admin.ModelAdmin):
-    list_display = ['xuser', 'xgroup', 'level']
+    list_display = ['user', 'xgroup', 'level']
     list_filter = ['level']
     search_fields = (
         ['xgroup__{0}'.format(field) for field in XGroupAdmin.search_fields]
diff --git a/xnet/groups/factories.py b/xnet/groups/factories.py
index a8e8d5d..3ee161e 100644
--- a/xnet/groups/factories.py
+++ b/xnet/groups/factories.py
@@ -23,6 +23,6 @@ class MembershipFactory(factory.DjangoModelFactory):
     FACTORY_FOR = models.Membership
 
     xgroup = factory.SubFactory(XGroupFactory)
-    xuser = factory.SubFactory(accounts_factories.AccountFactory)
+    user = factory.SubFactory(accounts_factories.AccountFactory)
     state = models.MembershipWorkflow.states.enabled
 
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)
diff --git a/xnet/groups/templates/groups/directory.html b/xnet/groups/templates/groups/directory.html
index 4dac21e..1b40a35 100644
--- a/xnet/groups/templates/groups/directory.html
+++ b/xnet/groups/templates/groups/directory.html
@@ -39,7 +39,7 @@
             <tr>
                 <td>
                     <span {% if memb.is_admin %}class="admin"{% endif %}>
-                        {{ memb.xuser }}
+                        {{ memb.user }}
                     </span>
                 </td>
                 <td>PROMO</td>
@@ -49,7 +49,7 @@
                     </a>
                     {% if is_admin %}
                         <i class="icon-pencil"></i>
-                        <a href="{% url 'groups:membership-delete' group.short memb.xuser.username %}">
+                        <a href="{% url 'groups:membership-delete' group.short memb.user.username %}">
                             <i class="icon-trash"></i>
                          </a>
                     {% endif %}