get rid of device_ports and self_options template vars

Netdisco/lib/App/Netdisco/Manual/WritingPlugins.pod

@@ -370,11 +370,6 @@ together with the correct default search options set.
 A path and query string which links to the Device tab of the Search page,
 together with the correct default search options set.
 
-=item  C<device_ports>
-
-A path and query sting which links to the Ports tab of the Device page,
-together with the correct default column view options set.
-
 =item  C<uri_base>
 
 Used for linking to static content within App::Netdisco safely if the base of
@@ -389,13 +384,6 @@ template safely if the base of the app is relocated:
 
  <a href="[% uri_for('/search') %]" ...>
 
-=item  C<self_options>
-
-Available in the Device tabs, use this if you need to refer back to the
-current page with some additional parameters, for example:
-
- <a href="[% uri_for('/device/ports', self_options) %]&foo=bar" ...>
-
 =back
 
 =head1 Javascript and Stylesheets

Netdisco/lib/App/Netdisco/Web.pm

@@ -82,7 +82,7 @@ hook 'before_template' => sub {
 
     # fix Plugin Template Variables to be only path+query
     $tokens->{$_} = $tokens->{$_}->path_query
-      for qw/search_node search_device device_ports/;
+      for qw/search_node search_device/;
 
     # shorthand access to section and tabname
     my @parts = split m{/}, request->path;

Netdisco/lib/App/Netdisco/Web/Device.pm

@@ -5,20 +5,6 @@ use Dancer::Plugin::Ajax;
 use Dancer::Plugin::DBIC;
 use Dancer::Plugin::Auth::Extensible;
 
-hook 'before_template' => sub {
-  my $tokens = shift;
-
-  # new searches will use these defaults in their sidebars
-  $tokens->{device_ports} = uri_for('/device/ports');
-
-  # for templates to link to same page with modified query but same options
-  my $self_uri = uri_for(request->path, scalar params);
-  $self_uri->query_param_delete('q');
-  $self_uri->query_param_delete('f');
-  $self_uri->query_param_delete('prefer');
-  $tokens->{self_options} = $self_uri->query_form_hash;
-};
-
 my $handler = sub {
     my $q = param('q');
     my ($tab) = splat;

Netdisco/share/views/ajax/admintask/undiscoveredneighbors.tt

@@ -10,7 +10,7 @@
   </tbody>
     [% FOREACH row IN results %]
     <tr>
-      <td><a href="[% device_ports %]&q=[% row.ip | uri %]&f=[% row.port | uri %]">
+      <td><a href="[% uri_for('/device/ports') %]&q=[% row.ip | uri %]&f=[% row.port | uri %]">
                [% row.dns || row.name || row.ip | html_entity %] ( [% row.port | html_entity %] ) </a></td>
       <td><a href="[% search_node %]&q=[% row.remote_ip | uri %]">
                                  [% row.remote_ip | html_entity %]</a>

Netdisco/share/views/ajax/device/addresses.tt

@@ -31,7 +31,7 @@ $(document).ready(function() {
         "type": 'portsort',
         "render": function(data, type, row, meta) {
           return type === 'display' ?
-            '<a href="[% device_ports %]&q=' + encodeURIComponent(row.ip) + '&f=' + encodeURIComponent(data) + '">' + he.encode(data || '') + '</a>' :
+            '<a href="[% uri_for('/device/ports') %]&q=' + encodeURIComponent(row.ip) + '&f=' + encodeURIComponent(data) + '">' + he.encode(data || '') + '</a>' :
             data;
         }
       }, {

Netdisco/share/views/ajax/device/ports.tt

@@ -117,7 +117,7 @@ $(document).ready(function() {
             [% ELSE %]
             cell_str += '';
             [% END %]
-            cell_str += '<a class="nd_this-port-only nd_port-only-first" href="[% uri_for('/device/ports',self_options) %]&q=[% params.q | uri %]&f='
+            cell_str += '<a class="nd_this-port-only nd_port-only-first" href="[% uri_for('/device/ports') %]&q=[% params.q | uri %]&f='
                 + encodeURIComponent(row.port) + '&prefer=port">';
             if (row.is_master) {
               cell_str += '<small><i class="icon-group muted"></i></small>&nbsp;';
@@ -125,7 +125,7 @@ $(document).ready(function() {
             cell_str += he.encode(row.port) + '</a>';
             if (row.slave_of) {
               cell_str += '<br/>'
-                + '<a class="nd_this-port-only" href="[% uri_for('/device/ports', self_options) %]&q=[% params.q | uri %]&f='
+                + '<a class="nd_this-port-only" href="[% uri_for('/device/ports') %]&q=[% params.q | uri %]&f='
                 + encodeURIComponent(row.slave_of) + '&prefer=port">'
                 + he.encode(row.slave_of) + '</a>';
             }
@@ -384,13 +384,13 @@ $(document).ready(function() {
                 else if (row.remote_type && row.remote_type.match(/(cisco\s+AIR-[L|C]?AP|-K9W8-|^AP:\s)/)) {
                   cell_str += '<i class="icon-signal"></i>&nbsp;';
                 }
-                cell_str += '<a href="[% uri_for('/device/ports', self_options) %]&q='
+                cell_str += '<a href="[% uri_for('/device/ports') %]&q='
                   + encodeURIComponent(row.neighbor_alias_ip) + '">';
                 var n_dns = row.neighbor_alias_dns ? row.neighbor_alias_dns.replace(d_suffix, '') : '';
                 cell_str += he.encode(n_dns || row.neighbor_alias_ip) + '</a>';
                 if (row.remote_port) {
                   cell_str += ' - '
-                    + '<a href="[% uri_for('/device/ports', self_options) %]&q='
+                    + '<a href="[% uri_for('/device/ports') %]&q='
                     + encodeURIComponent(row.neighbor_alias_ip)
                     + '&f=' + encodeURIComponent(row.remote_port)
                     + '&prefer=port">' + he.encode(row.remote_port || '') + '</a>';

Netdisco/share/views/ajax/report/apradiochannelpower.tt

@@ -59,7 +59,7 @@ $(document).ready(function() {
         "type": 'portsort',
         "render": function(data, type, row, meta) {
           return type === 'display' ?
-            '<a href="[% device_ports %]&q=' + encodeURIComponent(row.ip) + '&f=' + encodeURIComponent(data) + '">' + he.encode(data) + '</a>' :
+            '<a href="[% uri_for('/device/ports') %]&q=' + encodeURIComponent(row.ip) + '&f=' + encodeURIComponent(data) + '">' + he.encode(data) + '</a>' :
             data;
         }
       }, {

Netdisco/share/views/ajax/report/duplexmismatch.tt

@@ -27,7 +27,7 @@ $(document).ready(function() {
         "type": 'portsort',
         "render": function(data, type, row, meta) {
           return type === 'display' ?
-            '<a href="[% device_ports %]&q=' + encodeURIComponent(row.left_dns || row.left_ip) + '&f=' + encodeURIComponent(data) + '&c_duplex=on">' + he.encode(data) + '</a>' :
+            '<a href="[% uri_for('/device/ports') %]&q=' + encodeURIComponent(row.left_dns || row.left_ip) + '&f=' + encodeURIComponent(data) + '&c_duplex=on">' + he.encode(data) + '</a>' :
             data;
         }
       }, {
@@ -45,7 +45,7 @@ $(document).ready(function() {
         "type": 'portsort',
         "render": function(data, type, row, meta) {
           return type === 'display' ?
-            '<a href="[% device_ports %]&q=' + encodeURIComponent(row.right_dns || row.right_ip) + '&f=' + encodeURIComponent(data) + '&c_duplex=on">' + he.encode(data) + '</a>' :
+            '<a href="[% uri_for('/device/ports') %]&q=' + encodeURIComponent(row.right_dns || row.right_ip) + '&f=' + encodeURIComponent(data) + '&c_duplex=on">' + he.encode(data) + '</a>' :
             data;
         }
       }, {

Netdisco/share/views/ajax/report/halfduplex.tt

@@ -25,7 +25,7 @@ $(document).ready(function() {
         "type": 'portsort',
         "render": function(data, type, row, meta) {
           return type === 'display' ?
-            '<a href="[% device_ports %]&q=' + encodeURIComponent(row.ip) + '&f=' + encodeURIComponent(data) + '&c_duplex=on">' + he.encode(data) + '</a>' :
+            '<a href="[% uri_for('/device/ports') %]&q=' + encodeURIComponent(row.ip) + '&f=' + encodeURIComponent(data) + '&c_duplex=on">' + he.encode(data) + '</a>' :
             data;
         }
       }, {

Netdisco/share/views/ajax/report/nodemultiips.tt

@@ -30,7 +30,7 @@ $(document).ready(function() {
       }, {
         "data": 'port',
         "render": function(data, type, row, meta) {
-          return '<a href="[% device_ports %]&q=' + encodeURIComponent(row.switch) + '&f=' + encodeURIComponent(data) + '&c_nodes=on">' + he.encode(row.dns || row.name || row.switch) + '(' + he.encode(data) + ')</a>';
+          return '<a href="[% uri_for('/device/ports') %]&q=' + encodeURIComponent(row.switch) + '&f=' + encodeURIComponent(data) + '&c_nodes=on">' + he.encode(row.dns || row.name || row.switch) + '(' + he.encode(data) + ')</a>';
         }
       }, {
         "data": 'ip_count',

Netdisco/share/views/ajax/report/nodesdiscovered.tt

@@ -27,7 +27,7 @@ $(document).ready(function() {
         "type": 'portsort',
         "render": function(data, type, row, meta) {
           return type === 'display' ?
-            '<a href="[% device_ports %]&c_nodes=on&q=' + encodeURIComponent(row.ip) + '&f=' + encodeURIComponent(data) + '">' + he.encode(data) + '</a>' :
+            '<a href="[% uri_for('/device/ports') %]&c_nodes=on&q=' + encodeURIComponent(row.ip) + '&f=' + encodeURIComponent(data) + '">' + he.encode(data) + '</a>' :
             data;
         }
       }, {

Netdisco/share/views/ajax/report/nodevendor.tt

@@ -48,7 +48,7 @@ $(document).ready(function() {
       }, {
         "data": 'port',
         "render": function(data, type, row, meta) {
-          return '<a href="[% device_ports %]&q=' + encodeURIComponent(row.switch) + '&f=' + encodeURIComponent(data) + '&c_nodes=on&n_ssid=on">' + he.encode(row.device.dns || row.device.name || row.switch) + '(' + he.encode(data) + ')</a>';
+          return '<a href="[% uri_for('/device/ports') %]&q=' + encodeURIComponent(row.switch) + '&f=' + encodeURIComponent(data) + '&c_nodes=on&n_ssid=on">' + he.encode(row.device.dns || row.device.name || row.switch) + '(' + he.encode(data) + ')</a>';
         }
       }, {
         // Included for filtering

Netdisco/share/views/ajax/report/portadmindown.tt

@@ -25,7 +25,7 @@ $(document).ready(function() {
         "type": 'portsort',
         "render": function(data, type, row, meta) {
           return type === 'display' ?
-            '<a href="[% device_ports %]&q=' + encodeURIComponent(row.ip) + '&f=' + encodeURIComponent(data) + '&c_nodes=on">' + he.encode(data) + '</a>' :
+            '<a href="[% uri_for('/device/ports') %]&q=' + encodeURIComponent(row.ip) + '&f=' + encodeURIComponent(data) + '&c_nodes=on">' + he.encode(data) + '</a>' :
             data;
         }
       }, {

Netdisco/share/views/ajax/report/portblocking.tt

@@ -26,7 +26,7 @@ $(document).ready(function() {
         "type": 'portsort',
         "render": function(data, type, row, meta) {
           return type === 'display' ?
-            '<a href="[% device_ports %]&q=' + encodeURIComponent(row.ip) + '&f=' + encodeURIComponent(data) + '&c_nodes=on">' + he.encode(data) + '</a>' :
+            '<a href="[% uri_for('/device/ports') %]&q=' + encodeURIComponent(row.ip) + '&f=' + encodeURIComponent(data) + '&c_nodes=on">' + he.encode(data) + '</a>' :
             data;
         }
       }, {

Netdisco/share/views/ajax/report/portmultinodes.tt

@@ -26,7 +26,7 @@ $(document).ready(function() {
         "type": 'portsort',
         "render": function(data, type, row, meta) {
           return type === 'display' ?
-            '<a href="[% device_ports %]&q=' + encodeURIComponent(row.ip) + '&f=' + encodeURIComponent(data) + '&c_nodes=on">' + he.encode(data) + '</a>' :
+            '<a href="[% uri_for('/device/ports') %]&q=' + encodeURIComponent(row.ip) + '&f=' + encodeURIComponent(data) + '&c_nodes=on">' + he.encode(data) + '</a>' :
             data;
         }
       }, {

Netdisco/share/views/ajax/report/portssid.tt

@@ -33,7 +33,7 @@ $(document).ready(function() {
       {
       "data": 'ip',
       "render": function(data, type, row, meta) {
-        return '<a href="[% device_ports %]&q=' + encodeURIComponent(data) + '&f=' + encodeURIComponent(row.port.port) + '&c_nodes=on&n_ssid=on">' + he.encode(row.device.dns || row.device.name || row.ip) + '(' + he.encode(row.port.port) + ')</a>';
+        return '<a href="[% uri_for('/device/ports') %]&q=' + encodeURIComponent(data) + '&f=' + encodeURIComponent(row.port.port) + '&c_nodes=on&n_ssid=on">' + he.encode(row.device.dns || row.device.name || row.ip) + '(' + he.encode(row.port.port) + ')</a>';
         }
       }, {
         "data": 'broadcast',

Netdisco/share/views/ajax/report/portutilization.tt

@@ -19,7 +19,7 @@ $(document).ready(function() {
            {
                 "data": 'ip',
                 "render": function(data, type, row, meta) {
-                    return '<a href="[% device_ports %]&q=' + encodeURIComponent(data) + '">' + he.encode(row.dns || row.ip) + '</a>';
+                    return '<a href="[% uri_for('/device/ports') %]&q=' + encodeURIComponent(data) + '">' + he.encode(row.dns || row.ip) + '</a>';
                 }
             }, {
                 "data": 'port_count',

Netdisco/share/views/ajax/search/node_by_ip.tt

@@ -105,7 +105,7 @@
       <td>Switch Port</td>
       <td class="nd_center-cell">
         <a class="nd_linkcell"
-          href="[% device_ports %]&q=[% node.switch | uri %]&f=[% node.port | uri %]&c_nodes=on&c_neighbors=on">
+          href="[% uri_for('/device/ports') %]&q=[% node.switch | uri %]&f=[% node.port | uri %]&c_nodes=on&c_neighbors=on">
           [% node.switch | html_entity %] - [% node.port | html_entity %]
         [% '&nbsp;<i class="icon-book text-warning"></i>' IF NOT node.active %]</a>
         [% IF node.device.dns AND node.device_port AND node.device_port.name %]

Netdisco/share/views/ajax/search/node_by_mac.tt

@@ -45,7 +45,7 @@
       </td>
       <td>Switch Port</td>
       <td class="nd_center-cell">
-            <a href="[% device_ports %]&q=[% node.switch | uri %]&f=[% node.port | uri %]&c_nodes=on&c_neighbors=on">
+            <a href="[% uri_for('/device/ports') %]&q=[% node.switch | uri %]&f=[% node.port | uri %]&c_nodes=on&c_neighbors=on">
             [% node.switch | html_entity %] - [% node.port | html_entity %]</a>
         [% '&nbsp;<i class="icon-book text-warning"></i>&nbsp;' IF NOT node.active %]
         [% IF node.device.dns AND node.device_port AND node.device_port.name %]
@@ -69,7 +69,7 @@
       </td>
       <td>Switch Port</td>
       <td class="nd_center-cell">
-            <a href="[% device_ports %]&q=[% port.ip | uri %]&f=[% port.port | uri %]&c_mac=on&c_nodes=on&c_neighbors=on">
+            <a href="[% uri_for('/device/ports') %]&q=[% port.ip | uri %]&f=[% port.port | uri %]&c_mac=on&c_nodes=on&c_neighbors=on">
             [% port.ip | html_entity %] - [% port.descr | html_entity %]</a>
         [% IF port.device.dns AND port.name %]
           ([% port.device.dns | html_entity %] - [% port.name | html_entity %])

Netdisco/share/views/ajax/search/port.tt

@@ -26,7 +26,7 @@ $(document).ready(function() {
           if (row.device.dns || row.device.name) {
             ddns = ' (' + he.encode(row.device.dns || row.device.name)  + ')';
           }
-          return '<a href="[% device_ports %]&q=' + encodeURIComponent(data)
+          return '<a href="[% uri_for('/device/ports') %]&q=' + encodeURIComponent(data)
             + '&f=' + encodeURIComponent(row.port) + '">' + he.encode(data)
             + ' [' + he.encode(row.port) + ']</a>' + ddns;
         }

Netdisco/share/views/ajax/search/vlan.tt

@@ -19,32 +19,32 @@ $(document).ready(function() {
     "columns": [{
         "data": 'vlans.vlan',
         "render": function(data, type, row, meta) {
-          return '<a class="nd_linkcell nd_stealth-link" href="[% device_ports %]&q=' + encodeURIComponent(row.ip) + '&f=' + encodeURIComponent(data) + '">' + data + '</a>';
+          return '<a class="nd_linkcell nd_stealth-link" href="[% uri_for('/device/ports') %]&q=' + encodeURIComponent(row.ip) + '&f=' + encodeURIComponent(data) + '">' + data + '</a>';
         }
       }, {
         "data": 'ip',
         "render": function(data, type, row, meta) {
-          return '<a href="[% device_ports %]&q=' + encodeURIComponent(row.ip) + '&f=' + encodeURIComponent(row.vlans.vlan) + '">' + he.encode(row.dns || row.ip) + '</a>';
+          return '<a href="[% uri_for('/device/ports') %]&q=' + encodeURIComponent(row.ip) + '&f=' + encodeURIComponent(row.vlans.vlan) + '">' + he.encode(row.dns || row.ip) + '</a>';
         }
       }, {
         "data": 'vlans.description',
         "render": function(data, type, row, meta) {
-          return '<a class="nd_linkcell nd_stealth-link" href="[% device_ports %]&q=' + encodeURIComponent(row.ip) + '&f=' + encodeURIComponent(row.vlans.vlan) + '">' + he.encode(data || '') + '</a>';
+          return '<a class="nd_linkcell nd_stealth-link" href="[% uri_for('/device/ports') %]&q=' + encodeURIComponent(row.ip) + '&f=' + encodeURIComponent(row.vlans.vlan) + '">' + he.encode(data || '') + '</a>';
         }
       }, {
         "data": 'model',
         "render": function(data, type, row, meta) {
-          return '<a class="nd_linkcell nd_stealth-link" href="[% device_ports %]&q=' + encodeURIComponent(row.ip) + '&f=' + encodeURIComponent(row.vlans.vlan) + '">' + he.encode(data || '') + '</a>';
+          return '<a class="nd_linkcell nd_stealth-link" href="[% uri_for('/device/ports') %]&q=' + encodeURIComponent(row.ip) + '&f=' + encodeURIComponent(row.vlans.vlan) + '">' + he.encode(data || '') + '</a>';
         }
       }, {
         "data": 'os',
         "render": function(data, type, row, meta) {
-          return '<a class="nd_linkcell nd_stealth-link" href="[% device_ports %]&q=' + encodeURIComponent(row.ip) + '&f=' + encodeURIComponent(row.vlans.vlan) + '">' + he.encode(data || '') + '</a>';
+          return '<a class="nd_linkcell nd_stealth-link" href="[% uri_for('/device/ports') %]&q=' + encodeURIComponent(row.ip) + '&f=' + encodeURIComponent(row.vlans.vlan) + '">' + he.encode(data || '') + '</a>';
         }
       }, {
         "data": 'vendor',
         "render": function(data, type, row, meta) {
-          return '<a class="nd_linkcell nd_stealth-link" href="[% device_ports %]&q=' + encodeURIComponent(row.ip) + '&f=' + encodeURIComponent(row.vlans.vlan) + '">' + he.encode(data || '') + '</a>';
+          return '<a class="nd_linkcell nd_stealth-link" href="[% uri_for('/device/ports') %]&q=' + encodeURIComponent(row.ip) + '&f=' + encodeURIComponent(row.vlans.vlan) + '">' + he.encode(data || '') + '</a>';
         }
       }
     ],

Netdisco/share/views/report.tt

@@ -31,9 +31,9 @@
         href="#[% report.tag %]_pane">[% report.label %]</a></li>
       [% IF report.tag == 'portlog' %]
       <span id="nd_device-name">
-        <a href="[% device_ports %]&q=[% params.q | uri %]&c_admin=on">[% params.q %]</a>
+        <a href="[% uri_for('/device/ports') %]&q=[% params.q | uri %]&c_admin=on">[% params.q %]</a>
         -
-        <a href="[% device_ports %]&q=[% params.q | uri %]&f=[% params.f | uri %]&c_admin=on">[% params.f %]</a>
+        <a href="[% uri_for('/device/ports') %]&q=[% params.q | uri %]&f=[% params.f | uri %]&c_admin=on">[% params.f %]</a>
       </span>
       [% ELSIF report.provides_csv %]
       <span id="nd_device-name">