rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-23 20:03:11 +00:00
Code Issues Releases Wiki Activity

Reconstruction des migrations dans l'ordre pour preference + fix display

Browse source
This commit is contained in:
Gabriel Detraz 2018-08-01 19:07:01 +02:00
parent 19da3ce341
commit 7b7227332d
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
preferences/migrations/0046_mailcontact.py → preferences/migrations/0047_mailcontact.py
View file

@ -9,7 +9,7 @@ import re2o.mixins
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('preferences', '0045_remove_unused_payment_fields'), ('preferences', '0046_optionaluser_mail_extension'),
] ]
operations = [ operations = [

5
preferences/templates/preferences/display_preferences.html
View file

@ -213,7 +213,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
</i> Ajouter un service </i> Ajouter un service
</a> </a>
{% acl_end %} {% acl_end %}
<a class="btn btn-danger btn-sm" role="button" href="{% url 'preferences:del-services' %}"><i class="fa fa-trash"> <a class="btn btn-danger btn-sm" role="button" href="{% url 'preferences:del-service' %}"><i class="fa fa-trash">
</i> Supprimer un ou plusieurs service </i> Supprimer un ou plusieurs service
</a> </a>
{% include "preferences/aff_service.html" with service_list=service_list %} {% include "preferences/aff_service.html" with service_list=service_list %}
@ -222,8 +222,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<i class="fa fa-edit"></i> Editer <i class="fa fa-edit"></i> Editer
</a> </a>
<h4>Liste des adresses mail de contact</h4> <h2>{% trans "Contact email adresses list" %}</h2>
<h2>{% trans "Contact email adresses list" %}</h2>
{% can_create preferences.MailContact%} {% can_create preferences.MailContact%}
<a class="btn btn-primary btn-sm" role="button" href="{% url 'preferences:add-mailcontact' %}"><i class="fa fa-plus"></i>{% trans "Add an adress" %}</a> <a class="btn btn-primary btn-sm" role="button" href="{% url 'preferences:add-mailcontact' %}"><i class="fa fa-plus"></i>{% trans "Add an adress" %}</a>
{% acl_end %} {% acl_end %}