Merge branch 'fix-221'

This commit is contained in:
Thomas Waldmann 2015-12-29 12:53:32 +01:00
commit e4c6b62d3b
2 changed files with 22 additions and 2 deletions

View File

@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('main', '0007_auto_20150425_1741'),
]
operations = [
migrations.AlterField(
model_name='relatedhost',
name='interface_id_ipv6',
field=models.CharField(default=b'', max_length=40, blank=True, help_text='The IPv6 interface ID of this host. Use IPv6 notation. Empty = do not set record.', null=True, verbose_name='interface ID IPv6'),
preserve_default=True,
),
]

View File

@ -385,12 +385,12 @@ class RelatedHost(models.Model):
interface_id_ipv4 = models.CharField(
_("interface ID IPv4"),
default='', blank=True, null=True,
max_length=16, # 123.123.123.123
max_length=16,
help_text=_("The IPv4 interface ID of this host. Use IPv4 notation. Empty = do not set record."))
interface_id_ipv6 = models.CharField(
_("interface ID IPv6"),
default='', blank=True, null=True,
max_length=22, # ::1234:5678:9abc:def0
max_length=40,
help_text=_("The IPv6 interface ID of this host. Use IPv6 notation. Empty = do not set record."))
available = models.BooleanField(
_("available"),