Parcourir la source

Add a nickname field for members

Baptiste Jonglez il y a 10 ans
Parent
commit
a93c6a3bbf

+ 6 - 3
coin/members/admin.py

@@ -25,7 +25,8 @@ class MembershipFeeInline(admin.TabularInline):
 
 class MemberAdmin(UserAdmin):
     list_display = ('id', 'status', 'username', 'first_name', 'last_name',
-                    'organization_name', 'email', 'end_date_of_membership')
+                    'nickname', 'organization_name', 'email',
+                    'end_date_of_membership')
     list_display_links = ('id', 'username', 'first_name', 'last_name')
     list_filter = ('status', MembershipFeeFilter)
     search_fields = ['username', 'first_name', 'last_name', 'email']
@@ -39,7 +40,8 @@ class MemberAdmin(UserAdmin):
         ('Adhérent', {'fields': (
             ('status', 'resign_date'),
             'type',
-                ('first_name', 'last_name', 'organization_name'))}),
+            ('first_name', 'last_name', 'nickname'),
+            'organization_name')}),
         ('Coordonnées', {'fields': (
             'email',
             ('home_phone_number', 'mobile_phone_number'),
@@ -55,7 +57,8 @@ class MemberAdmin(UserAdmin):
         ('Adhérent', {'fields': (
             'status',
             'type',
-            ('first_name', 'last_name', 'organization_name'))}),
+            ('first_name', 'last_name', 'nickname'),
+            'organization_name')}),
         ('Coordonnées', {'fields': (
             'email',
             ('home_phone_number', 'mobile_phone_number'),

+ 20 - 0
coin/members/migrations/0008_member_nickname.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('members', '0007_auto_20141008_1107'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='member',
+            name='nickname',
+            field=models.CharField(default='', help_text='Pseudonyme, \u2026', max_length=64, verbose_name="nom d'usage", blank=True),
+            preserve_default=False,
+        ),
+    ]

+ 3 - 0
coin/members/models.py

@@ -39,6 +39,9 @@ class Member(CoinLdapSyncMixin, AbstractUser):
     type = models.CharField(max_length=20, choices=MEMBER_TYPE_CHOICES,
                             default='natural_person', verbose_name='type')
 
+    nickname = models.CharField(max_length=64, blank=True,
+                                verbose_name="nom d'usage",
+                                help_text='Pseudonyme, …')
     organization_name = models.CharField(max_length=200, blank=True,
                                          verbose_name="nom de l'organisme",
                                          help_text='Pour une personne morale')

+ 5 - 1
coin/members/templates/members/detail.html

@@ -13,7 +13,11 @@
             <table class="full-width">
                 <tr>
                     <td class="center"><span class="label">Prénom - Nom</span></td>
-                    <td>{{user.first_name}} {{user.last_name}}</td>
+                    <td>{{user.first_name}} {{user.last_name}}
+                      {% if user.nickname %}
+                      ({{ user.nickname }})
+                      {% endif %}
+                    </td>
                 </tr>
                 <tr>
                     <td class="center"><span class="label">Adresse</span></td>