Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #416: Images View permissions incorrect #418

Merged
merged 2 commits into from
Oct 29, 2023
Merged

Fixes #416: Images View permissions incorrect #418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7bc276
Add resize listener and height calculation
dreng Oct 27, 2023
57cf96c
Fixed typos
dreng Oct 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions netbox_topology_views/api/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,8 @@ class SaveRoleImageViewSet(PermissionRequiredMixin, ReadOnlyModelViewSet):
queryset = DeviceRole.objects.none()
serializer_class = RoleImageSerializer
permission_required = (
"dcim.add_device_role",
"dcim.change_device_role",
"dcim.add_devicerole",
"dcim.change_devicerole",
)

@action(detail=False, methods=["post"])
Expand Down
2 changes: 1 addition & 1 deletion netbox_topology_views/navigation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
),
('PREFERENCES',
(
PluginMenuItem(link="plugins:netbox_topology_views:images", link_text="Images", permissions=[ "dcim.view_site","dcim.view_device_role"]),
PluginMenuItem(link="plugins:netbox_topology_views:images", link_text="Images", permissions=[ "dcim.view_site","dcim.view_devicerole"]),
PluginMenuItem(link="plugins:netbox_topology_views:individualoptions", link_text="Individual Options", permissions=['netbox_topology_views.change_individualoptions']),
),
),
Expand Down
24 changes: 23 additions & 1 deletion netbox_topology_views/static/netbox_topology_views/css/app.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,23 @@
#visgraph{height:64vh}html[data-netbox-color-mode=dark] #visgraph{background-color:#212529}.image-dropdown img{width:64px;height:64px}.image-dropdown-content{display:flex;flex-wrap:wrap;gap:.5rem;padding-inline:.5rem;width:50vw;max-width:32rem}.image-dropdown-content>img{cursor:pointer}
#visgraph {
height:64vh;
border: 1px solid #ced4da
}
html[data-netbox-color-mode=dark]
#visgraph {
background-color:#212529;
border: 1px solid #495057
}
.image-dropdown img {
width:64px;height:64px
}
.image-dropdown-content {
display:flex;
flex-wrap:wrap;
gap:.5rem;
padding-inline:.5rem;
width:50vw;
max-width:32rem
}
.image-dropdown-content>img {
cursor:pointer
}
40 changes: 36 additions & 4 deletions netbox_topology_views/templates/netbox_topology_views/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
{% endblock controls %}

{% block tabs %}
<ul class="nav nav-tabs px-3">
<ul class="nav nav-tabs px-3" id="tabswrapper">
{% block tab_items %}
<li class="nav-item" role="presentation">
<button class="nav-link active" id="network-tab" data-bs-toggle="tab" data-bs-target="#networks" type="button" role="tab" aria-controls="filters-form" aria-selected="true">
Expand All @@ -50,11 +50,13 @@

{% block content-wrapper %}
{% with config=settings.PLUGINS_CONFIG.netbox_topology_views %}
<div class="tab-content">
<div class="tab-content" id="tabcontentwrapper">

{# Applied filters #}
{% if filter_form %}
{% applied_filters model filter_form request.GET %}
<div id="filterwrapper">
{% applied_filters model filter_form request.GET %}
</div>
{% endif %}

<div class="tab-pane show active" id="networks" role="tabpanel" aria-labelledby="network-tab">
Expand All @@ -78,6 +80,36 @@
const brokenImage = '{{ broken_image }}';
const topologyData = {{ topology_data | safe }};
const basePath = '{{ basepath }}';
</script>

window.addEventListener("resize", resizeCanvas);
resizeCanvas();

function resizeCanvas() {
heightToSubtract = getElementHeight('.navbar') +
getElementHeight('.title-container') +
getElementHeight('#tabswrapper') +
getElementHeight('#filterwrapper') +
getElementHeight('.footer') +
getElementPadding('#tabcontentwrapper');

document.getElementById("visgraph").style.height = "calc(100vh - " + heightToSubtract + "px)";
}

function getElementPadding(element) {
el = document.querySelector(element);
els = getComputedStyle(el);
padding = parseInt(els.paddingTop) + parseInt(els.paddingBottom);

return padding;
}

function getElementHeight(element) {
el = document.querySelector(element);
els = getComputedStyle(el);
height = el.offsetHeight + parseInt(els.marginTop) + parseInt(els.marginBottom);

return height;
}
</script>
<script src="{% static 'netbox_topology_views/js/app.js' %}" defer></script>
{% endblock javascript %}
6 changes: 3 additions & 3 deletions netbox_topology_views/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -771,9 +771,9 @@ def get(self, request):
class TopologyImagesView(PermissionRequiredMixin, View):
permission_required = (
"dcim.view_site",
"dcim.view_device_role",
"dcim.add_device_role",
"dcim.change_device_role",
"dcim.view_devicerole",
"dcim.add_devicerole",
"dcim.change_devicerole",
)

def get(self, request: HttpRequest):
Expand Down