From 0907a6ce5bbec7157914c00ca38c312cc9433b58 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 20 Jul 2018 19:44:04 -0400 Subject: [PATCH] Convert CustomFieldModel from object to abstract model --- netbox/extras/models.py | 5 ++++- netbox/virtualization/migrations/0001_virtualization.py | 3 --- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/netbox/extras/models.py b/netbox/extras/models.py index 512c7906b..8b90bd5c2 100644 --- a/netbox/extras/models.py +++ b/netbox/extras/models.py @@ -105,7 +105,10 @@ class Webhook(models.Model): # Custom fields # -class CustomFieldModel(object): +class CustomFieldModel(models.Model): + + class Meta: + abstract = True def cf(self): """ diff --git a/netbox/virtualization/migrations/0001_virtualization.py b/netbox/virtualization/migrations/0001_virtualization.py index cb553cf95..a5c7535cf 100644 --- a/netbox/virtualization/migrations/0001_virtualization.py +++ b/netbox/virtualization/migrations/0001_virtualization.py @@ -4,7 +4,6 @@ from __future__ import unicode_literals from django.db import migrations, models import django.db.models.deletion -import extras.models class Migration(migrations.Migration): @@ -30,7 +29,6 @@ class Migration(migrations.Migration): options={ 'ordering': ['name'], }, - bases=(models.Model, extras.models.CustomFieldModel), ), migrations.CreateModel( name='ClusterGroup', @@ -74,7 +72,6 @@ class Migration(migrations.Migration): options={ 'ordering': ['name'], }, - bases=(models.Model, extras.models.CustomFieldModel), ), migrations.AddField( model_name='cluster',