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

send full query str from netmap for json

Browse Source
This commit is contained in:
Oliver Gorwits
2017-12-23 22:31:23 +00:00
parent 9a13bb7f9b
commit b1b22c9811
4 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,11 +29,7 @@ function resizeGraphContainer() {
}, 500)
}
$.getJSON('[% uri_for('/ajax/data/device/netmap') %]',{
q: '[% params.q %]'
,vlan: '[% params.vlan %]'
,mapshow: '[% params.mapshow %]'
}, function(mapdata) {
$.getJSON('[% uri_for('/ajax/data/device/netmap') %]?[% my_query %]', function(mapdata) {
jQuery(document).ready(function() {
window.graph = netGobrechtsD3Force('netmap_pane')

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

@@ -64,7 +64,7 @@
<input type="radio" name="mapshow" id="nd_mapshow-only"
[% 'checked' IF vars.sidebar_defaults.device_netmap.mapshow == 'only' %]
[% 'disabled' IF NOT devgrp_list.size %] value="only">
<label for="nd_mapshow-only">Host Groups</label>
<label for="nd_mapshow-only">Host Groups[% ':' IF devgrp_list.size %]</label>
</div>
[% IF devgrp_list.size %]
@@ -82,6 +82,15 @@
<div class="clearfix nd_netmap-sidebar">
<div id="nd_vlan-label" class="control-group">
<div class="controls">
<label><span id="nd_vlan-label-text">Carrying VLAN: </span>
<input name="vlan" id="nd_vlan-entry" class="input-mini" type="number" placeholder="number"
value="[% params.vlan | html_entity %]" type="text"/>
</label>
</div>
</div>
[% IF devgrp_list.size %]
<div class="clearfix input-prepend">
<label class="add-on">
@@ -104,15 +113,6 @@
</label>
</div>
<div id="nd_vlan-label" class="control-group">
<div class="controls">
<label><span id="nd_vlan-label-text">Carrying VLAN: </span>
<input name="vlan" id="nd_vlan-entry" class="input-mini" type="number" placeholder="number"
value="[% params.vlan | html_entity %]" type="text"/>
</label>
</div>
</div>
</div>
<button id="[% tab.tag %]_submit" type="submit" class="btn btn-info">