mirror of
https://gitlab2.federez.net/re2o/re2o
synced 2024-08-20 14:13:41 +00:00
frontend sur l'affichage des options mail
This commit is contained in:
parent
ec9471391d
commit
024d7a073c
3 changed files with 47 additions and 22 deletions
|
@ -56,9 +56,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
<th>Creations de clubs par tous</th>
|
||||
<td>{{ useroptions.all_can_create_club|tick }}</td>
|
||||
</tr>
|
||||
<h5>{% if useroptions.mail_accounts %}<span class="label label-success">Comptes mails{% else %}<span class="label label-danger">Comptes mails{% endif%}</span></h5>
|
||||
<table class="table table-striped">
|
||||
<tr>
|
||||
<th>Extension mail interne</th>
|
||||
<td>{{ useroptions.mail_extension }}</td>
|
||||
<th>Gestion des comptes mails</th>
|
||||
<td>{{ useroptions.mail_accounts }}</td>
|
||||
<th>Extension mail interne</th>
|
||||
<td>{{ useroptions.mail_extension }}</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
|
|
|
@ -408,10 +408,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
</div>
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading clearfix" data-parent="#accordion" data-toggle="collapse" data-target="#collapse7">
|
||||
<h3 class="panel-title pull-left">
|
||||
<h3 class="panel-title pull-left">
|
||||
<i class="fa fa-envelope"></i>
|
||||
Gestion des mails
|
||||
</h3>
|
||||
Paramètres mail
|
||||
</h3>
|
||||
</div>
|
||||
<div id="collapse7" class="panel-collapse collapse">
|
||||
<div class="panel-body">
|
||||
|
@ -421,19 +421,26 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
Modifier les options mail
|
||||
</a>
|
||||
{% acl_end %}
|
||||
<div class="table-responsive">
|
||||
<table class="table">
|
||||
<tr>
|
||||
<th>Adresse mail externe</th>
|
||||
<th>Compte mail {{ asso_name }}</th>
|
||||
<th>Adresse mail de contact</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>{{ user.mail.external_mail }}</td>
|
||||
<td>{{ user.mail.internal_address|yesno:"Activé,Désactivé" }}</td>
|
||||
<td>{{ user.mail.external_mail }}</td>
|
||||
</table>
|
||||
</div>
|
||||
{% if mail_accounts %}
|
||||
<div class="table-responsive">
|
||||
<table class="table">
|
||||
<tr>
|
||||
<th>Adresse mail externe</th>
|
||||
<th>Compte mail {{ asso_name }}</th>
|
||||
<th>Adresse mail de contact</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>{{ user.external_mail }}</td>
|
||||
<td>{{ user.internal_address|yesno:"Activé,Désactivé" }}</td>
|
||||
<td>{{ user.get_mail }}</td>
|
||||
</table>
|
||||
<div class="alert alert-info" role="alert">
|
||||
Vous pouvez bénéficier d'une adresse mail {{ asso_name }}.
|
||||
Vous pouvez également la rediriger vers une adresse externe en modifiant les options mail.
|
||||
</div>
|
||||
</div>
|
||||
{% if user.internal_address %}
|
||||
|
||||
{% can_create MailAlias %}
|
||||
<a class="btn btn-primary btn-sm" role="button" href="{% url 'users:add-mailalias' users.id %}">
|
||||
<i class="fa fa-plus-square"></i>
|
||||
|
@ -443,7 +450,20 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
{% if alias_list %}
|
||||
{% include "users/aff_alias.html" with alias_list=alias_list %}
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endif %}
|
||||
{% else %}
|
||||
<div class="table-responsive">
|
||||
<table class="table">
|
||||
<tr>
|
||||
<th>Adresse mail</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>{{ user.external_mail }}</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -570,13 +570,13 @@ def edit_mail(request, mail_instance, **_kwargs):
|
|||
if mail.is_valid():
|
||||
if mail.changed_data:
|
||||
mail.save()
|
||||
messages.success(request, "Compte mail modifiée")
|
||||
messages.success(request, "Option mail modifiée")
|
||||
return redirect(reverse(
|
||||
'users:profil',
|
||||
kwargs={'userid': str(user_instance.id)}
|
||||
))
|
||||
return form(
|
||||
{'userform': mail, 'action_name': 'Editer un compte mail'},
|
||||
{'userform': mail, 'action_name': 'Editer les options mail'},
|
||||
'users/user.html',
|
||||
request
|
||||
)
|
||||
|
@ -1006,7 +1006,8 @@ def profil(request, users, **_kwargs):
|
|||
'asso_name': AssoOption.objects.first().name
|
||||
'allow_online_payment': allow_online_payment,
|
||||
'asso_name': AssoOption.objects.first().name,
|
||||
'alias_list': users.mail.mailalias_set.all()
|
||||
'alias_list': users.mailalias_set.all(),
|
||||
'mail_accounts': OptionalUser.objects.first().mail_accounts
|
||||
}
|
||||
)
|
||||
|
||||
|
|
Loading…
Reference in a new issue