mirror of
https://gitlab2.federez.net/re2o/re2o
synced 2024-11-05 01:16:27 +00:00
Merge branch 'fix_ns' into 'master'
Fix #119 : Plusieurs NS peuvent avoir le meme origin Closes #119 See merge request federez/re2o!149
This commit is contained in:
commit
f62178bebb
2 changed files with 22 additions and 1 deletions
21
machines/migrations/0080_auto_20180502_2334.py
Normal file
21
machines/migrations/0080_auto_20180502_2334.py
Normal file
|
@ -0,0 +1,21 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
# Generated by Django 1.11.6 on 2018-05-03 04:34
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import migrations, models
|
||||
import django.db.models.deletion
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('machines', '0079_auto_20180416_0107'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='ns',
|
||||
name='ns',
|
||||
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='machines.Domain'),
|
||||
),
|
||||
]
|
|
@ -613,7 +613,7 @@ class Ns(RevMixin, AclMixin, models.Model):
|
|||
PRETTY_NAME = "Enregistrements NS"
|
||||
|
||||
zone = models.ForeignKey('Extension', on_delete=models.PROTECT)
|
||||
ns = models.OneToOneField('Domain', on_delete=models.PROTECT)
|
||||
ns = models.ForeignKey('Domain', on_delete=models.PROTECT)
|
||||
|
||||
class Meta:
|
||||
permissions = (
|
||||
|
|
Loading…
Reference in a new issue