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

Install correct template path when site_local_files enabled

Browse Source
This commit is contained in:
Oliver Gorwits
2018-01-05 14:57:47 +00:00
parent 0cb3b491ff
commit 0f81a9368d
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Changes
View File

@@ -3,6 +3,7 @@
[BUG FIXES] [BUG FIXES]
* Fix favicon image path to work on non-apex installations * Fix favicon image path to work on non-apex installations
* Install correct template path when site_local_files enabled
2.038003 - 2018-01-04 2.038003 - 2018-01-04

8
lib/App/Netdisco/Web.pm
View File

@@ -55,9 +55,11 @@ push @{ config->{engines}->{netdisco_template_toolkit}->{INCLUDE_PATH} },
# any template paths in deployment.yml (should override plugins) # any template paths in deployment.yml (should override plugins)
if (setting('template_paths') and ref [] eq ref setting('template_paths')) { if (setting('template_paths') and ref [] eq ref setting('template_paths')) {
push @{setting('template_paths')}, if (setting('site_local_files')) {
dir(($ENV{NETDISCO_HOME} || $ENV{HOME}), 'nd-site-local', 'share')->stringify push @{setting('template_paths')},
if (setting('site_local_files')); 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} }, unshift @{ config->{engines}->{netdisco_template_toolkit}->{INCLUDE_PATH} },
@{setting('template_paths')}; @{setting('template_paths')};
} }