135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tweak mapshow

Browse Source
This commit is contained in:
Oliver Gorwits
2017-12-23 17:44:41 +00:00
parent 9f9971ff4e
commit f9e5ec02ab
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/App/Netdisco/Web/Plugin/Device/Neighbors.pm
View File

@@ -49,6 +49,11 @@ ajax '/ajax/data/device/netmappositions' => require_login sub {
} }
}; };
# mapshow=all,neighbors,only
# devgrp[]
# colorgroups
# dynamicsize
ajax '/ajax/data/device/netmap' => require_login sub { ajax '/ajax/data/device/netmap' => require_login sub {
my $q = param('q'); my $q = param('q');
my $qdev = schema('netdisco')->resultset('Device') my $qdev = schema('netdisco')->resultset('Device')
@@ -57,11 +62,9 @@ ajax '/ajax/data/device/netmap' => require_login sub {
my $vlan = param('vlan'); my $vlan = param('vlan');
undef $vlan if (defined $vlan and $vlan !~ m/^\d+$/); undef $vlan if (defined $vlan and $vlan !~ m/^\d+$/);
my $mapshow = (param('mapshow') || 'groups'); my $mapshow = (param('mapshow') || 'neighbors');
if (not $qdev or not $qdev->in_storage $mapshow = 'neighbors' if $mapshow !~ m/^(?:all|neighbors|only)$/;
or (defined $mapshow and $mapshow !~ m/^(?:neighbors|groups)$/)) { $mapshow = 'all' unless $qdev->in_storage;
$mapshow = 'groups';
}
my %id_for = (); my %id_for = ();
my %ok_dev = (); my %ok_dev = ();
@@ -123,7 +126,7 @@ ajax '/ajax/data/device/netmap' => require_login sub {
$v3data{nodes}->{ ($device->{row_number} - 1) } = { $v3data{nodes}->{ ($device->{row_number} - 1) } = {
ID => $device->{ip}, ID => $device->{ip},
SIZEVALUE => 3000, SIZEVALUE => 3000,
COLORVALUE => 10, (param('colorgroups') ? (COLORVALUE => 10) : ()),
LABEL => $name, LABEL => $name,
}; };

6
share/views/ajax/device/netmap.tt
View File

@@ -37,7 +37,8 @@ $.getJSON('[% uri_for('/ajax/data/device/netmap') %]',{
jQuery(document).ready(function() { jQuery(document).ready(function() {
window.graph = netGobrechtsD3Force('netmap_pane') window.graph = netGobrechtsD3Force('netmap_pane')
// .debug(true) .debug(true)
[% '.showLegend(false)' IF NOT params.colorgroups %]
.lassoMode(true) .lassoMode(true)
.dragMode(true) .dragMode(true)
.nodeEventToOpenLink('click') .nodeEventToOpenLink('click')
@@ -75,6 +76,9 @@ $.getJSON('[% uri_for('/ajax/data/device/netmap') %]',{
,'vlan=[% params.vlan %]&positions=' + JSON.stringify(graph.positions()) ,'vlan=[% params.vlan %]&positions=' + JSON.stringify(graph.positions())
); );
} }
// else {
// graph.zoomToFit();
// }
graph.inspect().main.nodes.on('mouseup.dragall', function(n) { graph.inspect().main.nodes.on('mouseup.dragall', function(n) {
graph['nd2']['dragging'] = false; graph['nd2']['dragging'] = false;

3
share/views/sidebar/device/netmap.tt
View File

@@ -50,7 +50,8 @@
<hr class="nd_sidebar-hr"/> <hr class="nd_sidebar-hr"/>
<div class="radio radio-success"> <div class="radio radio-success">
<input type="radio" name="mapshow" id="nd_mapshow-all" value="all"> <input type="radio" name="mapshow" id="nd_mapshow-all"
[% 'checked' IF params.mapshow == 'all' %] value="all">
<label for="nd_mapshow-all">All Devices</label> <label for="nd_mapshow-all">All Devices</label>
</div> </div>
<div class="radio radio-success"> <div class="radio radio-success">