diff --git a/Changes b/Changes index ef4e54dd..619f0c6f 100644 --- a/Changes +++ b/Changes @@ -3,6 +3,7 @@ [BUG FIXES] * Fix favicon image path to work on non-apex installations + * Install correct template path when site_local_files enabled 2.038003 - 2018-01-04 diff --git a/lib/App/Netdisco/Web.pm b/lib/App/Netdisco/Web.pm index 6702c416..901eee0d 100644 --- a/lib/App/Netdisco/Web.pm +++ b/lib/App/Netdisco/Web.pm @@ -55,9 +55,11 @@ push @{ config->{engines}->{netdisco_template_toolkit}->{INCLUDE_PATH} }, # any template paths in deployment.yml (should override plugins) if (setting('template_paths') and ref [] eq ref setting('template_paths')) { - push @{setting('template_paths')}, - dir(($ENV{NETDISCO_HOME} || $ENV{HOME}), 'nd-site-local', 'share')->stringify - if (setting('site_local_files')); + if (setting('site_local_files')) { + push @{setting('template_paths')}, + dir(($ENV{NETDISCO_HOME} || $ENV{HOME}), 'nd-site-local', 'share')->stringify, + dir(($ENV{NETDISCO_HOME} || $ENV{HOME}), 'nd-site-local', 'share', 'views')->stringify; + } unshift @{ config->{engines}->{netdisco_template_toolkit}->{INCLUDE_PATH} }, @{setting('template_paths')}; }