mirror of
				https://github.com/netbox-community/netbox.git
				synced 2024-05-10 07:54:54 +00:00 
			
		
		
		
	Add label to DeviceBay models and serializers
				
					
				
			This commit is contained in:
		@@ -331,7 +331,7 @@ class DeviceBayTemplateSerializer(ValidatedModelSerializer):
 | 
			
		||||
 | 
			
		||||
    class Meta:
 | 
			
		||||
        model = DeviceBayTemplate
 | 
			
		||||
        fields = ['id', 'device_type', 'name']
 | 
			
		||||
        fields = ['id', 'device_type', 'name', 'label']
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
#
 | 
			
		||||
@@ -603,7 +603,7 @@ class DeviceBaySerializer(TaggitSerializer, ValidatedModelSerializer):
 | 
			
		||||
 | 
			
		||||
    class Meta:
 | 
			
		||||
        model = DeviceBay
 | 
			
		||||
        fields = ['id', 'device', 'name', 'description', 'installed_device', 'tags']
 | 
			
		||||
        fields = ['id', 'device', 'name', 'label', 'description', 'installed_device', 'tags']
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
#
 | 
			
		||||
 
 | 
			
		||||
@@ -60,4 +60,14 @@ class Migration(migrations.Migration):
 | 
			
		||||
            name='label',
 | 
			
		||||
            field=models.CharField(blank=True, max_length=64),
 | 
			
		||||
        ),
 | 
			
		||||
        migrations.AddField(
 | 
			
		||||
            model_name='devicebay',
 | 
			
		||||
            name='label',
 | 
			
		||||
            field=models.CharField(blank=True, max_length=64),
 | 
			
		||||
        ),
 | 
			
		||||
        migrations.AddField(
 | 
			
		||||
            model_name='devicebaytemplate',
 | 
			
		||||
            name='label',
 | 
			
		||||
            field=models.CharField(blank=True, max_length=64),
 | 
			
		||||
        ),
 | 
			
		||||
    ]
 | 
			
		||||
 
 | 
			
		||||
@@ -433,14 +433,16 @@ class DeviceBayTemplate(ComponentTemplateModel):
 | 
			
		||||
        max_length=100,
 | 
			
		||||
        blank=True
 | 
			
		||||
    )
 | 
			
		||||
    label = models.CharField(
 | 
			
		||||
        max_length=64,
 | 
			
		||||
        blank=True,
 | 
			
		||||
        help_text="Physical label"
 | 
			
		||||
    )
 | 
			
		||||
 | 
			
		||||
    class Meta:
 | 
			
		||||
        ordering = ('device_type', '_name')
 | 
			
		||||
        unique_together = ('device_type', 'name')
 | 
			
		||||
 | 
			
		||||
    def __str__(self):
 | 
			
		||||
        return self.name
 | 
			
		||||
 | 
			
		||||
    def instantiate(self, device):
 | 
			
		||||
        return DeviceBay(
 | 
			
		||||
            device=device,
 | 
			
		||||
 
 | 
			
		||||
@@ -1009,6 +1009,11 @@ class DeviceBay(ComponentModel):
 | 
			
		||||
        max_length=100,
 | 
			
		||||
        blank=True
 | 
			
		||||
    )
 | 
			
		||||
    label = models.CharField(
 | 
			
		||||
        max_length=64,
 | 
			
		||||
        blank=True,
 | 
			
		||||
        help_text="Physical label"
 | 
			
		||||
    )
 | 
			
		||||
    installed_device = models.OneToOneField(
 | 
			
		||||
        to='dcim.Device',
 | 
			
		||||
        on_delete=models.SET_NULL,
 | 
			
		||||
@@ -1025,6 +1030,8 @@ class DeviceBay(ComponentModel):
 | 
			
		||||
        unique_together = ('device', 'name')
 | 
			
		||||
 | 
			
		||||
    def __str__(self):
 | 
			
		||||
        if self.label:
 | 
			
		||||
            return '{} - {} ({})'.format(self.device.name, self.name, self.label)
 | 
			
		||||
        return '{} - {}'.format(self.device.name, self.name)
 | 
			
		||||
 | 
			
		||||
    def get_absolute_url(self):
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user