From 04ea76c5889ae146e137b709e959f0dc46754921 Mon Sep 17 00:00:00 2001 From: Gabriel Detraz Date: Thu, 14 Sep 2017 15:24:12 +0000 Subject: [PATCH] Deplacement du reglage autocapture --- ...emove_optionaltopologie_mac_autocapture.py | 19 +++++++++++++++++++ preferences/models.py | 1 - .../preferences/display_preferences.html | 4 ---- 3 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 preferences/migrations/0019_remove_optionaltopologie_mac_autocapture.py diff --git a/preferences/migrations/0019_remove_optionaltopologie_mac_autocapture.py b/preferences/migrations/0019_remove_optionaltopologie_mac_autocapture.py new file mode 100644 index 00000000..f423994c --- /dev/null +++ b/preferences/migrations/0019_remove_optionaltopologie_mac_autocapture.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.7 on 2017-09-14 16:11 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('preferences', '0018_optionaltopologie_mac_autocapture'), + ] + + operations = [ + migrations.RemoveField( + model_name='optionaltopologie', + name='mac_autocapture', + ), + ] diff --git a/preferences/models.py b/preferences/models.py index 2c6be69e..7d750f77 100644 --- a/preferences/models.py +++ b/preferences/models.py @@ -59,7 +59,6 @@ class OptionalTopologie(models.Model): radius_general_policy = models.CharField(max_length=32, choices=CHOICE_RADIUS, default='DEFINED') vlan_decision_ok = models.OneToOneField('machines.Vlan', on_delete=models.PROTECT, related_name='decision_ok', blank=True, null=True) vlan_decision_nok = models.OneToOneField('machines.Vlan', on_delete=models.PROTECT, related_name='decision_nok', blank=True, null=True) - mac_autocapture = models.BooleanField(default=False) class GeneralOption(models.Model): PRETTY_NAME = "Options générales" diff --git a/preferences/templates/preferences/display_preferences.html b/preferences/templates/preferences/display_preferences.html index 17ece295..d96f4ed7 100644 --- a/preferences/templates/preferences/display_preferences.html +++ b/preferences/templates/preferences/display_preferences.html @@ -96,10 +96,6 @@ with this program; if not, write to the Free Software Foundation, Inc., Vlan où placer les machines après rejet RADIUS {{ topologieoptions.vlan_decision_nok }} - - Autocapture des macs à la connexion - {{ topologieoptions.mac_autocapture }} -

Préférences generales

{% if is_bureau %}