| @@ -25,10 +25,12 class DeviceType(models.Model): | |||||
| 25 | class Device(models.Model): |
|
25 | class Device(models.Model): | |
| 26 |
|
26 | |||
| 27 | device_type = models.ForeignKey(DeviceType) |
|
27 | device_type = models.ForeignKey(DeviceType) | |
|
|
28 | name = models.CharField(max_length=40, default='') | |||
| 28 | model = models.CharField(max_length=40, default='') |
|
29 | model = models.CharField(max_length=40, default='') | |
| 29 | serial = models.CharField(max_length=40, default='') |
|
30 | serial_number = models.CharField(max_length=40, default='') | |
| 30 | ip_address = models.GenericIPAddressField(protocol='IPv4', default='0.0.0.0') |
|
31 | ip_address = models.GenericIPAddressField(protocol='IPv4', default='0.0.0.0') | |
| 31 | mac_address = models.CharField(max_length = 20, null=True, blank=True) |
|
32 | mac_address = models.CharField(max_length = 20, null=True, blank=True) | |
|
|
33 | description = models.TextField(blank=True, null=True) | |||
| 32 | status = models.PositiveSmallIntegerField(default=1, choices=STATES) |
|
34 | status = models.PositiveSmallIntegerField(default=1, choices=STATES) | |
| 33 |
|
35 | |||
| 34 | class Meta: |
|
36 | class Meta: | |
| @@ -102,7 +102,7 def device(request, id_dev=0): | |||||
| 102 | kwargs['suptitle'] = 'Detail' |
|
102 | kwargs['suptitle'] = 'Detail' | |
| 103 | else: |
|
103 | else: | |
| 104 | devices = Device.objects.all() |
|
104 | devices = Device.objects.all() | |
| 105 | kwargs['keys'] = ['device_type__name', 'model', 'serial', 'ip_address', 'status'] |
|
105 | kwargs['keys'] = ['device_type__name', 'model', 'serial_number', 'ip_address', 'status'] | |
| 106 | keys = ['id']+kwargs['keys'] |
|
106 | keys = ['id']+kwargs['keys'] | |
| 107 | kwargs['items'] = devices.values(*keys) |
|
107 | kwargs['items'] = devices.values(*keys) | |
| 108 | kwargs['suptitle'] = 'List' |
|
108 | kwargs['suptitle'] = 'List' | |
General Comments 0
You need to be logged in to leave comments.
Login now