diff --git a/arch/models.py b/arch/models.py index 89a754e1..b4ff8ea6 100644 --- a/arch/models.py +++ b/arch/models.py @@ -24,6 +24,7 @@ class Architecture(models.Model): class Meta: abstract = True + ordering = ['name'] def __str__(self): return self.name diff --git a/domains/models.py b/domains/models.py index 343e0666..f8c2f869 100644 --- a/domains/models.py +++ b/domains/models.py @@ -22,5 +22,8 @@ class Domain(models.Model): name = models.CharField(max_length=255, unique=True) + class Meta: + ordering = ['name'] + def __str__(self): return self.name diff --git a/errata/tests/test_integration.py b/errata/tests/test_integration.py index 254e7aae..2139adb8 100644 --- a/errata/tests/test_integration.py +++ b/errata/tests/test_integration.py @@ -15,6 +15,7 @@ # along with Patchman. If not, see from django.test import TestCase, override_settings +from django.utils import timezone from errata.models import Erratum from operatingsystems.models import OSRelease @@ -37,7 +38,7 @@ def test_erratum_with_cves(self): name='RHSA-2024:1234', e_type='Security Advisory', synopsis='Important: curl security update', - issue_date='2024-03-15', + issue_date=timezone.now(), ) erratum.cves.add(cve1, cve2) @@ -54,7 +55,7 @@ def test_erratum_with_osreleases(self): name='RHSA-2024:1235', e_type='Security Advisory', synopsis='Important: openssl security update', - issue_date='2024-03-16', + issue_date=timezone.now(), ) erratum.osreleases.add(osrelease1, osrelease2) @@ -66,7 +67,7 @@ def test_erratum_with_packages(self): name='RHSA-2024:1236', e_type='Bug Fix', synopsis='Bug fix: httpd update', - issue_date='2024-03-17', + issue_date=timezone.now(), ) # Verify erratum can store package references diff --git a/etc/patchman/local_settings.py b/etc/patchman/local_settings.py index 9d0b683b..6705f44c 100644 --- a/etc/patchman/local_settings.py +++ b/etc/patchman/local_settings.py @@ -111,5 +111,7 @@ 'loggers': { 'urllib3': {'level': 'WARNING', 'handlers': ['console'], 'propagate': False}, 'git': {'level': 'WARNING', 'handlers': ['console'], 'propagate': False}, + 'version_utils': {'level': 'WARNING', 'handlers': ['console'], 'propagate': False}, + 'celery': {'level': 'WARNING', 'handlers': ['console'], 'propagate': False}, } } diff --git a/hosts/models.py b/hosts/models.py index 4689ccc5..7c646b98 100644 --- a/hosts/models.py +++ b/hosts/models.py @@ -352,6 +352,7 @@ class HostRepo(models.Model): class Meta: unique_together = ['host', 'repo'] + ordering = ['host', 'repo'] def __str__(self): return f'{self.host}-{self.repo}' diff --git a/packages/models.py b/packages/models.py index 74a83c0c..9274a168 100644 --- a/packages/models.py +++ b/packages/models.py @@ -227,6 +227,7 @@ class PackageUpdate(models.Model): class Meta: unique_together = ['oldpackage', 'newpackage', 'security'] + ordering = ['oldpackage', 'newpackage'] def __str__(self): if self.security: diff --git a/repos/models.py b/repos/models.py index 9b9082af..8af9377a 100644 --- a/repos/models.py +++ b/repos/models.py @@ -56,6 +56,7 @@ class Repository(models.Model): class Meta: verbose_name_plural = 'Repository' verbose_name_plural = 'Repositories' + ordering = ['name'] def __str__(self): return self.name @@ -154,6 +155,7 @@ class Mirror(models.Model): class Meta: verbose_name_plural = 'Mirror' verbose_name_plural = 'Mirrors' + ordering = ['url'] def __str__(self): return self.url @@ -203,3 +205,6 @@ class MirrorPackage(models.Model): mirror = models.ForeignKey(Mirror, on_delete=models.CASCADE) package = models.ForeignKey(Package, on_delete=models.CASCADE) enabled = models.BooleanField(default=True) + + class Meta: + ordering = ['mirror', 'package'] diff --git a/security/models.py b/security/models.py index 405c8db6..60921281 100644 --- a/security/models.py +++ b/security/models.py @@ -33,6 +33,7 @@ class Reference(models.Model): class Meta: unique_together = ['ref_type', 'url'] + ordering = ['ref_type', 'url'] def __str__(self): return self.url @@ -44,6 +45,9 @@ class CWE(models.Model): name = models.CharField(max_length=255, blank=True, null=True) description = models.TextField(blank=True, default='') + class Meta: + ordering = ['cwe_id'] + def __str__(self): return f'{self.cwe_id} - {self.name}'