rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-30 16:42:25 +00:00
Code Issues Releases Wiki Activity

Deplacement du reglage autocapture

Browse source
This commit is contained in:
Gabriel Detraz 2017-09-14 15:24:12 +00:00 committed by root
parent 60308c3130
commit 04ea76c588
3 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
preferences/migrations/0019_remove_optionaltopologie_mac_autocapture.py Normal file
View file

@ -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',
),
]

1
preferences/models.py
View file

@ -59,7 +59,6 @@ class OptionalTopologie(models.Model):
radius_general_policy = models.CharField(max_length=32, choices=CHOICE_RADIUS, default='DEFINED') 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_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) 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): class GeneralOption(models.Model):
PRETTY_NAME = "Options générales" PRETTY_NAME = "Options générales"

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

@ -96,10 +96,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<th>Vlan où placer les machines après rejet RADIUS</th> <th>Vlan où placer les machines après rejet RADIUS</th>
<td>{{ topologieoptions.vlan_decision_nok }}</td> <td>{{ topologieoptions.vlan_decision_nok }}</td>
</tr> </tr>
<tr>
<th>Autocapture des macs à la connexion</th>
<td>{{ topologieoptions.mac_autocapture }}
</tr>
</table> </table>
<h4>Préférences generales</h4> <h4>Préférences generales</h4>
{% if is_bureau %} {% if is_bureau %}