mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Fixes #1655. Removed explicit field references. (#1656)

Browse Source 
* Fixes #1655

Further field name references were found in `consoleport.html`. These have now been removed, so we rely on proper a proper `__str__` implementation of both `ConsolePort` and `ConsoleServerPort`.

* Fixes #1655: Removed explicit field references

Cleaned up all (notable) .name references, and removed them so __str__ can do the lifting. Did not remove the references where it was explicitly referenced to .name (eg. in details). Extended the Secret model to also include the name in __str__, since that was weirdly absent.

* Adapted PR to comply with comments

Re-introduced certain references to make sure explicit references are still used where needed.
This commit is contained in:
Ichabond
2017-11-02 08:51:27 -07:00
committed by Jeremy Stretch
parent e56fc4b1ee
commit b8df05cf88
18 changed files with 37 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
netbox/secrets/models.py
View File

@@ -286,6 +286,9 @@ class Secret(CreatedUpdatedModel):
super(Secret, self).__init__(*args, **kwargs)
def __str__(self):
if self.role and self.device and self.name:
return '{} for {} ({})'.format(self.role, self.device, self.name)
# Return role and device if no name is set
if self.role and self.device:
return '{} for {}'.format(self.role, self.device)
return 'Secret'