From 06bf5f4fdc88a2090a2f971b53f898e41244f225 Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Wed, 18 Jan 2012 15:40:27 +0000 Subject: [PATCH] more liberal path checks --- Netdisco/lib/Netdisco/Web/Device.pm | 2 +- Netdisco/lib/Netdisco/Web/Search.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Netdisco/lib/Netdisco/Web/Device.pm b/Netdisco/lib/Netdisco/Web/Device.pm index b931cfb4..6eed5c1d 100644 --- a/Netdisco/lib/Netdisco/Web/Device.pm +++ b/Netdisco/lib/Netdisco/Web/Device.pm @@ -34,7 +34,7 @@ hook 'before' => sub { ]); # set up default search options for each type - if (request->path =~ m{^/device}) { + if (request->path =~ m{/device$}) { if (not param('tab') or param('tab') ne 'ports' or scalar keys %{params()} < 4) { foreach my $col (@{ var('port_columns') }) { params->{$col->{name}} = 'checked' if $col->{default} eq 'on'; diff --git a/Netdisco/lib/Netdisco/Web/Search.pm b/Netdisco/lib/Netdisco/Web/Search.pm index 18caec68..4bf0684a 100644 --- a/Netdisco/lib/Netdisco/Web/Search.pm +++ b/Netdisco/lib/Netdisco/Web/Search.pm @@ -17,7 +17,7 @@ hook 'before' => sub { } # set up default search options for each type - if (request->path =~ m{^/search}) { + if (request->path =~ m{/search$}) { if (not param('tab') or param('tab') ne 'node') { params->{'stamps'} = 'checked'; }