Merge pull request #48 from Nebucatnetzer/sort-dropdowns

sort the dropdowns alphabetically

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)
 

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

core/models/company.py

@@ -7,6 +7,7 @@ class Company(models.Model):
 
     class Meta:
         abstract = True
+        ordering = ['name']
 
     def __str__(self):
         return self.name

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"
 
 

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"

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

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()

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
 

softwares/models/os.py

@@ -11,4 +11,5 @@ class OperatingSystem(models.Model):
         return self.name
 
     class Meta:
+        ordering = ['name']
         verbose_name_plural = "Operating Systems"

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

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"

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