Commit 377447d2 authored by Maël Kervella's avatar Maël Kervella

Club : Add option to specify if a mailing should be generated for

parent 082f6847
...@@ -343,6 +343,7 @@ class ClubForm(FieldPermissionFormMixin, ModelForm): ...@@ -343,6 +343,7 @@ class ClubForm(FieldPermissionFormMixin, ModelForm):
self.fields['room'].label = 'Local' self.fields['room'].label = 'Local'
self.fields['room'].empty_label = "Pas de chambre" self.fields['room'].empty_label = "Pas de chambre"
self.fields['school'].empty_label = "Séléctionner un établissement" self.fields['school'].empty_label = "Séléctionner un établissement"
self.fields['mailing'].label = 'Utiliser une mailing'
class Meta: class Meta:
model = Club model = Club
...@@ -355,6 +356,7 @@ class ClubForm(FieldPermissionFormMixin, ModelForm): ...@@ -355,6 +356,7 @@ class ClubForm(FieldPermissionFormMixin, ModelForm):
'room', 'room',
'telephone', 'telephone',
'shell', 'shell',
'mailing'
] ]
def clean_telephone(self): def clean_telephone(self):
......
# -*- coding: utf-8 -*-
# Generated by Django 1.10.7 on 2018-03-07 15:34
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('users', '0068_auto_20180107_2245'),
]
operations = [
migrations.AddField(
model_name='club',
name='mailing',
field=models.BooleanField(default=False),
),
]
...@@ -850,6 +850,9 @@ class Club(User): ...@@ -850,6 +850,9 @@ class Club(User):
to='users.Adherent', to='users.Adherent',
related_name='club_members' related_name='club_members'
) )
mailing = models.BooleanField(
default = False
)
def can_create(user_request, *args, **kwargs): def can_create(user_request, *args, **kwargs):
"""Check if an user can create an user object. """Check if an user can create an user object.
......
...@@ -60,8 +60,17 @@ with this program; if not, write to the Free Software Foundation, Inc., ...@@ -60,8 +60,17 @@ with this program; if not, write to the Free Software Foundation, Inc.,
</p> </p>
<table class="table table-striped"> <table class="table table-striped">
<tr> <tr>
{% if users.is_class_club %}
<th>Mailing</th>
{% if users.club.mailing %}
<td>{{ users.pseudo }}(-admin)</td>
{% else %}
<td>Mailing désactivée</td>
{% endif %}
{% else %}
<th>Prénom</th> <th>Prénom</th>
<td>{{ users.name }}</td> <td>{{ users.name }}</td>
{% endif %}
<th>Nom</th> <th>Nom</th>
<td>{{ users.surname }}</td> <td>{{ users.surname }}</td>
</tr> </tr>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment