Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions arch/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ class Architecture(models.Model):

class Meta:
abstract = True
ordering = ['name']

def __str__(self):
return self.name
Expand Down
3 changes: 3 additions & 0 deletions domains/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 4 additions & 3 deletions errata/tests/test_integration.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
# along with Patchman. If not, see <http://www.gnu.org/licenses/>

from django.test import TestCase, override_settings
from django.utils import timezone

from errata.models import Erratum
from operatingsystems.models import OSRelease
Expand All @@ -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)

Expand All @@ -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)

Expand All @@ -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
Expand Down
2 changes: 2 additions & 0 deletions etc/patchman/local_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -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},
}
}
1 change: 1 addition & 0 deletions hosts/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -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}'
1 change: 1 addition & 0 deletions packages/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ class PackageUpdate(models.Model):

class Meta:
unique_together = ['oldpackage', 'newpackage', 'security']
ordering = ['oldpackage', 'newpackage']

def __str__(self):
if self.security:
Expand Down
5 changes: 5 additions & 0 deletions repos/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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']
4 changes: 4 additions & 0 deletions security/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}'

Expand Down