mirror of
https://gitlab2.federez.net/re2o/re2o
synced 2024-11-05 01:16:27 +00:00
Merge branch 'switch_better_display' into 'master'
Switch better display Closes #102 See merge request federez/re2o!139
This commit is contained in:
commit
b77a612845
2 changed files with 48 additions and 4 deletions
36
topologie/migrations/0059_auto_20180415_2249.py
Normal file
36
topologie/migrations/0059_auto_20180415_2249.py
Normal file
|
@ -0,0 +1,36 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
# Generated by Django 1.10.7 on 2018-04-16 03:49
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import migrations, models
|
||||
import django.db.models.deletion
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('topologie', '0058_remove_switch_location'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='switch',
|
||||
name='model',
|
||||
field=models.ForeignKey(blank=True, help_text='Modèle du switch', null=True, on_delete=django.db.models.deletion.SET_NULL, to='topologie.ModelSwitch'),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='switch',
|
||||
name='number',
|
||||
field=models.PositiveIntegerField(help_text='Nombre de ports'),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='switch',
|
||||
name='stack_member_id',
|
||||
field=models.PositiveIntegerField(blank=True, help_text='Baie de brassage du switch', null=True),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='switch',
|
||||
name='switchbay',
|
||||
field=models.ForeignKey(blank=True, help_text='Baie de brassage du switch', null=True, on_delete=django.db.models.deletion.SET_NULL, to='topologie.SwitchBay'),
|
||||
),
|
||||
]
|
|
@ -121,25 +121,33 @@ class Switch(AclMixin, Machine):
|
|||
id_max de la stack parente"""
|
||||
PRETTY_NAME = "Switch / Commutateur"
|
||||
|
||||
number = models.PositiveIntegerField()
|
||||
number = models.PositiveIntegerField(
|
||||
help_text="Nombre de ports"
|
||||
)
|
||||
stack = models.ForeignKey(
|
||||
'topologie.Stack',
|
||||
blank=True,
|
||||
null=True,
|
||||
on_delete=models.SET_NULL
|
||||
)
|
||||
stack_member_id = models.PositiveIntegerField(blank=True, null=True)
|
||||
stack_member_id = models.PositiveIntegerField(
|
||||
blank=True,
|
||||
null=True,
|
||||
help_text="Baie de brassage du switch"
|
||||
)
|
||||
model = models.ForeignKey(
|
||||
'topologie.ModelSwitch',
|
||||
blank=True,
|
||||
null=True,
|
||||
on_delete=models.SET_NULL
|
||||
on_delete=models.SET_NULL,
|
||||
help_text="Modèle du switch"
|
||||
)
|
||||
switchbay = models.ForeignKey(
|
||||
'topologie.SwitchBay',
|
||||
blank=True,
|
||||
null=True,
|
||||
on_delete=models.SET_NULL
|
||||
on_delete=models.SET_NULL,
|
||||
help_text="Baie de brassage du switch"
|
||||
)
|
||||
|
||||
class Meta:
|
||||
|
|
Loading…
Reference in a new issue