Added get_status_class to template code and change to CustomFieldModel for InterfaceModel

This commit is contained in:
Joseph Kennedy 2017-08-28 02:24:50 -04:00
parent 271c771b76
commit 9e086932d9
2 changed files with 5 additions and 3 deletions

View File

@ -1121,7 +1121,7 @@ class PowerOutlet(models.Model):
# #
@python_2_unicode_compatible @python_2_unicode_compatible
class Interface(models.Model): class Interface(CreatedUpdatedModel, CustomFieldModel):
""" """
A physical data interface within a Device. An Interface can connect to exactly one other Interface via the creation A physical data interface within a Device. An Interface can connect to exactly one other Interface via the creation
of an InterfaceConnection. of an InterfaceConnection.
@ -1209,6 +1209,9 @@ class Interface(models.Model):
pass pass
return bool(self.connection) return bool(self.connection)
def get_status_class(self):
return IFACE_ENABLED_CHOICES[self.enabled]
@property @property
def connection(self): def connection(self):
try: try:

View File

@ -104,7 +104,7 @@ DEVICE_STATUS = """
""" """
INTERFACE_ENABLED = """ INTERFACE_ENABLED = """
<span class="label label-{{ record.get_status_class }}">{{ record.get_status_display }}</span> <span class="label label-{{ record.get_status_class }}">{{ record.enabled }}</span>
""" """
DEVICE_PRIMARY_IP = """ DEVICE_PRIMARY_IP = """
@ -540,7 +540,6 @@ class InterfaceImportTable(BaseTable):
args=[Accessor('interface.device.pk')], verbose_name='Device') args=[Accessor('interface.device.pk')], verbose_name='Device')
lag = tables.LinkColumn('dcim:interface', accessor=Accessor('self.name'), lag = tables.LinkColumn('dcim:interface', accessor=Accessor('self.name'),
args=[Accessor('self.pk')], verbose_name='Lag ID') args=[Accessor('self.pk')], verbose_name='Lag ID')
#lag = tables.Column(verbose_name='Lag ID')
name = tables.Column(verbose_name='Interface') name = tables.Column(verbose_name='Interface')
mac_address = tables.Column(verbose_name='MAC Address') mac_address = tables.Column(verbose_name='MAC Address')
form_factor = tables.Column(verbose_name='Form Factor') form_factor = tables.Column(verbose_name='Form Factor')