From a7ea8a151881869506f6231ae5adfecb56af0da0 Mon Sep 17 00:00:00 2001
From: Hugo LEVY-FALK <hugo.levy--falk@supelec.fr>
Date: Fri, 3 Aug 2018 00:21:23 +0200
Subject: [PATCH] =?UTF-8?q?R=C3=A9pare=20de=20petits=20soucis=20de=20templ?=
 =?UTF-8?q?ates=20+=20problemes=20de=20rebase?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/serializers.py                                 | 9 ---------
 machines/migrations/{0084_role.py => 0086_role.py} | 2 +-
 machines/templates/machines/aff_role.html          | 3 ++-
 machines/templates/machines/machine.html           | 1 +
 4 files changed, 4 insertions(+), 11 deletions(-)
 rename machines/migrations/{0084_role.py => 0086_role.py} (96%)

diff --git a/api/serializers.py b/api/serializers.py
index 839a1047..3a5f7f90 100644
--- a/api/serializers.py
+++ b/api/serializers.py
@@ -624,15 +624,6 @@ class ServiceRegenSerializer(NamespacedHMSerializer):
         }
 
 
-class ProfilSerializer(NamespacedHMSerializer):
-    vlan_untagged = VlanSerializer(read_only=True)
-    vlan_tagged = VlanPortSerializer(read_only=True, many=True)
-
-    class Meta:
-        model = topologie.PortProfile
-        fields = ('name', 'profil_default', 'vlan_untagged', 'vlan_tagged', 'radius_type', 'radius_mode', 'speed', 'mac_limit', 'flow_control', 'dhcp_snooping', 'dhcpv6_snooping', 'arp_protect', 'ra_guard', 'loop_protect', 'vlan_untagged', 'vlan_tagged')
-
-
 # LOCAL EMAILS
 
 
diff --git a/machines/migrations/0084_role.py b/machines/migrations/0086_role.py
similarity index 96%
rename from machines/migrations/0084_role.py
rename to machines/migrations/0086_role.py
index 49343809..a23de26f 100644
--- a/machines/migrations/0084_role.py
+++ b/machines/migrations/0086_role.py
@@ -9,7 +9,7 @@ import re2o.mixins
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('machines', '0083_remove_duplicate_rights'),
+        ('machines', '0085_sshfingerprint'),
     ]
 
     operations = [
diff --git a/machines/templates/machines/aff_role.html b/machines/templates/machines/aff_role.html
index f83a4adb..519e8fd6 100644
--- a/machines/templates/machines/aff_role.html
+++ b/machines/templates/machines/aff_role.html
@@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 {% load acl %}
 {% load i18n %}
+{% load logs_extra %}
 
 
 <table class="table table-striped">
@@ -45,7 +46,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         {% can_edit role %}
             {% include 'buttons/edit.html' with href='machines:edit-role' id=role.id %}
         {% acl_end %}
-            {% include 'buttons/history.html' with href='machines:history' name='role' id=role.id %}
+            {% history_button role %}
         </td>
     </tr>
     {% endfor %}
diff --git a/machines/templates/machines/machine.html b/machines/templates/machines/machine.html
index cd00ba0c..d6c0f522 100644
--- a/machines/templates/machines/machine.html
+++ b/machines/templates/machines/machine.html
@@ -71,6 +71,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% endif %}
 {% if sshfpform %}
     {% bootstrap_form_errors sshfpform %}
+{% endif %}
 {% if roleform %}
     {% bootstrap_form_errors roleform %}
 {% endif %}