From 7b7227332ddf6d269fd1cde9416041b87a100180 Mon Sep 17 00:00:00 2001
From: Gabriel Detraz <detraz@crans.org>
Date: Wed, 1 Aug 2018 19:07:01 +0200
Subject: [PATCH] Reconstruction des migrations dans l'ordre pour preference +
 fix display

---
 .../migrations/{0046_mailcontact.py => 0047_mailcontact.py}  | 2 +-
 preferences/templates/preferences/display_preferences.html   | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)
 rename preferences/migrations/{0046_mailcontact.py => 0047_mailcontact.py} (93%)

diff --git a/preferences/migrations/0046_mailcontact.py b/preferences/migrations/0047_mailcontact.py
similarity index 93%
rename from preferences/migrations/0046_mailcontact.py
rename to preferences/migrations/0047_mailcontact.py
index 1364ff66..c7b7eda5 100644
--- a/preferences/migrations/0046_mailcontact.py
+++ b/preferences/migrations/0047_mailcontact.py
@@ -9,7 +9,7 @@ import re2o.mixins
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('preferences', '0045_remove_unused_payment_fields'),
+        ('preferences', '0046_optionaluser_mail_extension'),
     ]
 
     operations = [
diff --git a/preferences/templates/preferences/display_preferences.html b/preferences/templates/preferences/display_preferences.html
index 5d2e2dd0..2e34db5a 100644
--- a/preferences/templates/preferences/display_preferences.html
+++ b/preferences/templates/preferences/display_preferences.html
@@ -213,7 +213,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     </i> Ajouter un service
 </a>
 {% 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
 </a>
 {%  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
 </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%}
   <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 %}