mirror of
https://gitlab2.federez.net/re2o/re2o
synced 2024-11-09 03:16:25 +00:00
Merge branch 'fix_typo_ap' into 'dev'
Fixe une typo sur les bornes wifi -> access_point See merge request federez/re2o!316
This commit is contained in:
commit
7575453126
2 changed files with 22 additions and 2 deletions
20
topologie/migrations/0065_auto_20180927_1836.py
Normal file
20
topologie/migrations/0065_auto_20180927_1836.py
Normal file
|
@ -0,0 +1,20 @@
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
# Generated by Django 1.10.7 on 2018-09-27 16:36
|
||||||
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('topologie', '0064_switch_automatic_provision'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='portprofile',
|
||||||
|
name='profil_default',
|
||||||
|
field=models.CharField(blank=True, choices=[('room', 'room'), ('access_point', 'access_point'), ('uplink', 'uplink'), ('asso_machine', 'asso_machine'), ('nothing', 'nothing')], max_length=32, null=True, unique=True, verbose_name='Default profile'),
|
||||||
|
),
|
||||||
|
]
|
|
@ -311,7 +311,7 @@ class Switch(AclMixin, Machine):
|
||||||
""" Returns the 'main' interface of the switch
|
""" Returns the 'main' interface of the switch
|
||||||
It must the the management interface for that device"""
|
It must the the management interface for that device"""
|
||||||
switch_iptype = OptionalTopologie.get_cached_value('switchs_ip_type')
|
switch_iptype = OptionalTopologie.get_cached_value('switchs_ip_type')
|
||||||
if switch_iptype:
|
if switch_iptype:
|
||||||
return self.interface_set.filter(type__ip_type=switch_iptype).first()
|
return self.interface_set.filter(type__ip_type=switch_iptype).first()
|
||||||
return self.interface_set.first()
|
return self.interface_set.first()
|
||||||
|
|
||||||
|
@ -672,7 +672,7 @@ class PortProfile(AclMixin, RevMixin, models.Model):
|
||||||
)
|
)
|
||||||
PROFIL_DEFAULT = (
|
PROFIL_DEFAULT = (
|
||||||
('room', 'room'),
|
('room', 'room'),
|
||||||
('accespoint', 'accesspoint'),
|
('access_point', 'access_point'),
|
||||||
('uplink', 'uplink'),
|
('uplink', 'uplink'),
|
||||||
('asso_machine', 'asso_machine'),
|
('asso_machine', 'asso_machine'),
|
||||||
('nothing', 'nothing'),
|
('nothing', 'nothing'),
|
||||||
|
|
Loading…
Reference in a new issue