diff --git a/backups/models/backup.py b/backups/models/backup.py index 853f8ce..bddb975 100644 --- a/backups/models/backup.py +++ b/backups/models/backup.py @@ -11,6 +11,7 @@ class BackupMethod(Category): description = models.TextField() class Meta: + ordering = ['name'] verbose_name_plural = "Backup Methods" @@ -28,6 +29,9 @@ class Backup(models.Model): target_device = models.ManyToManyField(Computer, through='TargetDevice', blank=True) + class Meta: + ordering = ['name'] + def __str__(self): return str(self.name) diff --git a/backups/models/notification.py b/backups/models/notification.py index 20c3062..819ed18 100644 --- a/backups/models/notification.py +++ b/backups/models/notification.py @@ -14,5 +14,8 @@ class Notification(models.Model): notification_type = models.ForeignKey(NotificationType, models.SET_NULL, blank=True, null=True) + class Meta: + ordering = ['name'] + def __str__(self): return self.name diff --git a/core/models/company.py b/core/models/company.py index ff9b6b4..0dca6b2 100644 --- a/core/models/company.py +++ b/core/models/company.py @@ -7,6 +7,7 @@ class Company(models.Model): class Meta: abstract = True + ordering = ['name'] def __str__(self): return self.name diff --git a/customers/models.py b/customers/models.py index ebad783..8f84e0f 100644 --- a/customers/models.py +++ b/customers/models.py @@ -9,6 +9,9 @@ class Owner(Company): class Customer(Company): name = models.CharField(max_length=50) + class Meta: + ordering = ['name'] + def __str__(self): return self.name @@ -20,6 +23,7 @@ class Customer(Company): class DeviceManufacturer(Company): class Meta: + ordering = ['name'] verbose_name_plural = "Device Manufacturers" diff --git a/devices/models/device.py b/devices/models/device.py index c3b1041..0b45234 100644 --- a/devices/models/device.py +++ b/devices/models/device.py @@ -16,6 +16,7 @@ class DeviceManufacturer(Company): website = models.URLField(null=True, blank=True) class Meta: + ordering = ['name'] verbose_name_plural = "Device Manufacturers" def get_absolute_url(self): @@ -26,6 +27,7 @@ class DeviceManufacturer(Company): class DeviceCategory(Category): class Meta: + ordering = ['name'] verbose_name_plural = "Device Categories" @@ -34,6 +36,9 @@ class HardwareModel(models.Model): manufacturer = models.ForeignKey(DeviceManufacturer, on_delete=models.CASCADE) + class Meta: + ordering = ['name'] + def __str__(self): return self.name @@ -71,6 +76,9 @@ class Device(models.Model): installation_date = models.DateField(null=True, blank=True) net = models.ManyToManyField(Net, through='DeviceInNet') + class Meta: + ordering = ['name'] + def __str__(self): return self.name @@ -97,4 +105,5 @@ class DeviceInNet(models.Model): return "{}: {}".format(self.ip, self.ip_status) class Meta: + ordering = ['ip'] verbose_name_plural = "Devices in Net" diff --git a/devices/models/warranty.py b/devices/models/warranty.py index 00de4af..636dfa7 100644 --- a/devices/models/warranty.py +++ b/devices/models/warranty.py @@ -11,6 +11,7 @@ class WarrantyType(Category): description = models.TextField() class Meta: + ordering = ['name'] verbose_name_plural = "Warranty Types" @@ -34,6 +35,7 @@ class Warranty(models.Model): return str(self.device) class Meta: + ordering = ['customer'] verbose_name_plural = "Warranties" @property diff --git a/licenses/models.py b/licenses/models.py index de8c6cc..748ce2c 100644 --- a/licenses/models.py +++ b/licenses/models.py @@ -24,6 +24,9 @@ class UserLicense(License): max_allowed_users = models.IntegerField(null=True, blank=True) user = models.ManyToManyField(User, through="LicenseWithUser") + class Meta: + ordering = ['software'] + @property def used_licenses(self): return LicenseWithUser.objects.filter(license=self).count() @@ -33,6 +36,9 @@ class ComputerLicense(License): max_allowed_computers = models.IntegerField(null=True, blank=True) computer = models.ManyToManyField(Computer, through="LicenseWithComputer") + class Meta: + ordering = ['software'] + @property def used_licenses(self): return LicenseWithComputer.objects.filter(license=self).count() diff --git a/nets/models.py b/nets/models.py index 9622cdf..ac6e5ae 100644 --- a/nets/models.py +++ b/nets/models.py @@ -6,6 +6,7 @@ from core.models import Category class IpStatus(Category): class Meta: + ordering = ['name'] verbose_name_plural = "IP Status" verbose_name = "IP Status" @@ -17,6 +18,9 @@ class Net(models.Model): customer = models.ForeignKey(Customer, on_delete=models.CASCADE) description = models.TextField(blank=True, null=True) + class Meta: + ordering = ['name'] + def __str__(self): return self.name diff --git a/softwares/models/os.py b/softwares/models/os.py index 27be97a..419b876 100644 --- a/softwares/models/os.py +++ b/softwares/models/os.py @@ -11,4 +11,5 @@ class OperatingSystem(models.Model): return self.name class Meta: + ordering = ['name'] verbose_name_plural = "Operating Systems" diff --git a/softwares/models/software.py b/softwares/models/software.py index 27c3390..d4a5459 100644 --- a/softwares/models/software.py +++ b/softwares/models/software.py @@ -6,12 +6,14 @@ from core.models import Category class SoftwareArchitecture(Category): class Meta: + ordering = ['name'] verbose_name_plural = "Software Architectures" class SoftwareCategory(Category): class Meta: + ordering = ['name'] verbose_name_plural = "Software Categories" @@ -20,5 +22,8 @@ class Software(models.Model): category = models.ForeignKey(SoftwareCategory, models.SET_NULL, null=True, blank=True) + class Meta: + ordering = ['name'] + def __str__(self): return self.name diff --git a/users/models/groups.py b/users/models/groups.py index 068e6f6..bbca007 100644 --- a/users/models/groups.py +++ b/users/models/groups.py @@ -16,6 +16,7 @@ class Group(models.Model): class AdGroup(Group): class Meta: + ordering = ['name'] verbose_name_plural = "AD Groups" @@ -23,4 +24,5 @@ class MailGroup(Group): mail_address = models.EmailField() class Meta: + ordering = ['name'] verbose_name_plural = "Mail Groups" diff --git a/users/models/user.py b/users/models/user.py index 07d8aa3..a44168d 100644 --- a/users/models/user.py +++ b/users/models/user.py @@ -16,6 +16,9 @@ class User(models.Model): ad_groups = models.ManyToManyField(AdGroup, through='UserInAdGroup') mail_groups = models.ManyToManyField(MailGroup, through='UserInMailGroup') + class Meta: + ordering = ['name'] + def __str__(self): return self.name + " " + self.first_name