From f350c34074099589a80907f1b01c2bca26110f32 Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Mon, 2 Sep 2013 22:46:14 +0100 Subject: [PATCH] remove unecessary JS using template var --- Netdisco/lib/App/Netdisco/Web/Device.pm | 5 ++++- Netdisco/lib/App/Netdisco/Web/Search.pm | 1 + Netdisco/share/views/js/common.js | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Netdisco/lib/App/Netdisco/Web/Device.pm b/Netdisco/lib/App/Netdisco/Web/Device.pm index 68240692..eda1d55d 100644 --- a/Netdisco/lib/App/Netdisco/Web/Device.pm +++ b/Netdisco/lib/App/Netdisco/Web/Device.pm @@ -121,7 +121,10 @@ get '/device' => require_login sub { } params->{'tab'} ||= 'details'; - template 'device', { d => $dev }; + template 'device', { + d => $dev, + device => params->{'tab'}, + }; }; true; diff --git a/Netdisco/lib/App/Netdisco/Web/Search.pm b/Netdisco/lib/App/Netdisco/Web/Search.pm index 3f60cb3d..376a5a9c 100644 --- a/Netdisco/lib/App/Netdisco/Web/Search.pm +++ b/Netdisco/lib/App/Netdisco/Web/Search.pm @@ -105,6 +105,7 @@ get '/search' => require_login sub { my $vendor_list = [ $s->resultset('Device')->get_distinct_col('vendor') ]; template 'search', { + search => params->{'tab'}, model_list => $model_list, os_ver_list => $os_ver_list, vendor_list => $vendor_list, diff --git a/Netdisco/share/views/js/common.js b/Netdisco/share/views/js/common.js index 48b10561..29e9810a 100644 --- a/Netdisco/share/views/js/common.js +++ b/Netdisco/share/views/js/common.js @@ -38,6 +38,7 @@ } $(document).ready(function() { + [% IF search %] // search tabs [% FOREACH tab IN settings._search_tabs %] $('[% "#${tab.tag}_form" %]').submit(function (event) { @@ -47,7 +48,9 @@ do_search(event, '[% tab.tag %]'); }); [% END %] + [% END %] + [% IF device %] // device tabs [% FOREACH tab IN settings._device_tabs %] $('[% "#${tab.tag}_form" %]').submit(function (event) { @@ -57,6 +60,7 @@ do_search(event, '[% tab.tag %]'); }); [% END %] + [% END %] [% IF report %] // for the report pages