Procházet zdrojové kódy

DataFile should not inherit from ChangeLoggingMixin

jeremystretch před 3 roky
rodič
revize
a1c9f7a2c6

+ 2 - 2
netbox/core/migrations/0001_initial.py

@@ -43,9 +43,9 @@ class Migration(migrations.Migration):
             name='DataFile',
             fields=[
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False)),
-                ('created', models.DateTimeField(auto_now_add=True, null=True)),
-                ('path', models.CharField(editable=False, max_length=1000)),
+                ('created', models.DateTimeField(auto_now_add=True)),
                 ('last_updated', models.DateTimeField(editable=False)),
+                ('path', models.CharField(editable=False, max_length=1000)),
                 ('size', models.PositiveIntegerField(editable=False)),
                 ('hash', models.CharField(editable=False, max_length=64, validators=[django.core.validators.RegexValidator(message='Length must be 64 hexadecimal characters.', regex='^[0-9a-f]{64}$')])),
                 ('data', models.BinaryField()),

+ 7 - 4
netbox/core/models/data.py

@@ -228,11 +228,17 @@ class DataSource(PrimaryModel):
         return False
 
 
-class DataFile(ChangeLoggingMixin, models.Model):
+class DataFile(models.Model):
     """
     The database representation of a remote file fetched from a remote DataSource. DataFile instances should be created,
     updated, or deleted only by calling DataSource.sync().
     """
+    created = models.DateTimeField(
+        auto_now_add=True
+    )
+    last_updated = models.DateTimeField(
+        editable=False
+    )
     source = models.ForeignKey(
         to='core.DataSource',
         on_delete=models.CASCADE,
@@ -244,9 +250,6 @@ class DataFile(ChangeLoggingMixin, models.Model):
         editable=False,
         help_text=_("File path relative to the data source's root")
     )
-    last_updated = models.DateTimeField(
-        editable=False
-    )
     size = models.PositiveIntegerField(
         editable=False
     )

+ 0 - 1
netbox/core/tests/test_views.py

@@ -50,7 +50,6 @@ class DataSourceTestCase(ViewTestCases.PrimaryObjectViewTestCase):
 
 class DataFileTestCase(
     ViewTestCases.GetObjectViewTestCase,
-    ViewTestCases.GetObjectChangelogViewTestCase,
     ViewTestCases.DeleteObjectViewTestCase,
     ViewTestCases.ListObjectsViewTestCase,
     ViewTestCases.BulkDeleteObjectsViewTestCase,