diff --git a/apps/main/models.py b/apps/main/models.py index 3f60479..6aac9ab 100644 --- a/apps/main/models.py +++ b/apps/main/models.py @@ -25,10 +25,12 @@ class DeviceType(models.Model): class Device(models.Model): device_type = models.ForeignKey(DeviceType) + name = models.CharField(max_length=40, default='') model = models.CharField(max_length=40, default='') - serial = models.CharField(max_length=40, default='') + serial_number = models.CharField(max_length=40, default='') ip_address = models.GenericIPAddressField(protocol='IPv4', default='0.0.0.0') mac_address = models.CharField(max_length = 20, null=True, blank=True) + description = models.TextField(blank=True, null=True) status = models.PositiveSmallIntegerField(default=1, choices=STATES) class Meta: diff --git a/apps/main/views.py b/apps/main/views.py index 5435877..008280b 100644 --- a/apps/main/views.py +++ b/apps/main/views.py @@ -102,7 +102,7 @@ def device(request, id_dev=0): kwargs['suptitle'] = 'Detail' else: devices = Device.objects.all() - kwargs['keys'] = ['device_type__name', 'model', 'serial', 'ip_address', 'status'] + kwargs['keys'] = ['device_type__name', 'model', 'serial_number', 'ip_address', 'status'] keys = ['id']+kwargs['keys'] kwargs['items'] = devices.values(*keys) kwargs['suptitle'] = 'List'