From b34d7054fc7863c01428aa4638dd535cec186a99 Mon Sep 17 00:00:00 2001 From: Raoul Thill Date: Wed, 18 Jan 2017 12:30:52 +0100 Subject: [PATCH 1/4] Adding Racks with the same name to different groups within same site #238 Add rack group to ordering --- netbox/dcim/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 030de3436..3300b1054 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -337,9 +337,9 @@ class Rack(CreatedUpdatedModel, CustomFieldModel): objects = RackManager() class Meta: - ordering = ['site', 'name'] + ordering = ['site', 'name', 'group'] unique_together = [ - ['site', 'name'], + ['site', 'name', 'group'], ['site', 'facility_id'], ] From 91bd6a7162beb712dda2f7c4fd1058ca6e2b2ccf Mon Sep 17 00:00:00 2001 From: Raoul Thill Date: Wed, 18 Jan 2017 14:21:58 +0100 Subject: [PATCH 2/4] Adding migration file #238 --- netbox/dcim/migrations/0025_rack_group.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 netbox/dcim/migrations/0025_rack_group.py diff --git a/netbox/dcim/migrations/0025_rack_group.py b/netbox/dcim/migrations/0025_rack_group.py new file mode 100644 index 000000000..33e1d4ee4 --- /dev/null +++ b/netbox/dcim/migrations/0025_rack_group.py @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2017-01-18 11:16 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('dcim', '0024_site_add_contact_fields'), + ] + + operations = [ + migrations.AlterModelOptions( + name='rack', + options={'ordering': ['site', 'name', 'group']}, + ), + migrations.AlterUniqueTogether( + name='rack', + unique_together=set([('site', 'facility_id'), ('site', 'name', 'group')]), + ), + ] \ No newline at end of file From 3b82f146d7805906ee90a69ed3e708edcc51f10b Mon Sep 17 00:00:00 2001 From: Raoul Thill Date: Wed, 18 Jan 2017 14:42:12 +0100 Subject: [PATCH 3/4] Migration --- netbox/dcim/migrations/{0025_rack_group.py => 0026_rack_group.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename netbox/dcim/migrations/{0025_rack_group.py => 0026_rack_group.py} (100%) diff --git a/netbox/dcim/migrations/0025_rack_group.py b/netbox/dcim/migrations/0026_rack_group.py similarity index 100% rename from netbox/dcim/migrations/0025_rack_group.py rename to netbox/dcim/migrations/0026_rack_group.py From e146067cfd50ae8549671854d6fb13c8665bb234 Mon Sep 17 00:00:00 2001 From: Raoul Thill Date: Wed, 18 Jan 2017 14:54:27 +0100 Subject: [PATCH 4/4] Fix migration --- netbox/dcim/migrations/0026_rack_group.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/netbox/dcim/migrations/0026_rack_group.py b/netbox/dcim/migrations/0026_rack_group.py index 33e1d4ee4..ad67f6dff 100644 --- a/netbox/dcim/migrations/0026_rack_group.py +++ b/netbox/dcim/migrations/0026_rack_group.py @@ -8,7 +8,7 @@ from django.db import migrations class Migration(migrations.Migration): dependencies = [ - ('dcim', '0024_site_add_contact_fields'), + ('dcim', '0025_devicetype_add_interface_ordering'), ] operations = [ @@ -20,4 +20,4 @@ class Migration(migrations.Migration): name='rack', unique_together=set([('site', 'facility_id'), ('site', 'name', 'group')]), ), - ] \ No newline at end of file + ]