Closes #10904: Added Colors to SVG for Front and Rear Ports #10905
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fix for feature request 10904 thanks to @TheZackCodec
dvigne
changed the title
dvigne
changed the title
netbox/dcim/svg/cables.py
Outdated
Comment on lines
169
to
171
| if(hasattr(instance, 'get_color') and instance.get_color()): | ||
| return instance.get_color() | ||
| return 'f0f0f0' |
Member
There was a problem hiding this comment.
No need for a method here. You can just do:
Suggested change
| if(hasattr(instance, 'get_color') and instance.get_color()): | |
| return instance.get_color() | |
| return 'f0f0f0' | |
| return getattr(instance, 'color', 'f0f0f0') |
Contributor
Author
There was a problem hiding this comment.
This is much cleaner and I like the syntax a lot better, but what I'm finding is that the model has blank=True set for both the FrontPort and RearPort models and this leads to an empty string being stored in the database. This logic fails because it always has the color attribute, it just happens to be a blank string.
A quick solution for this would be change that one line to something like below, but I'm open to suggestions.
Suggested change
| if(hasattr(instance, 'get_color') and instance.get_color()): | |
| return instance.get_color() | |
| return 'f0f0f0' | |
| return getattr(instance, 'color', 'f0f0f0') or 'f0f0f0' |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix for feature request 10904 thanks to @TheZackCodec
Fixes: #10904
When rendering the SVG, checks if a custom color is defined and renders that color on the termination.