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

properly search the template path!! [#103]

Browse Source 
Conflicts:
	Netdisco/lib/App/Netdisco/Web.pm
	Netdisco/lib/App/Netdisco/Web/Plugin.pm
This commit is contained in:
Oliver Gorwits
2014-06-23 20:35:30 +01:00
parent f29c8960ed
commit 6dbed02b7c
5 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Netdisco/Changes
View File

@@ -24,6 +24,7 @@
* Store started timestamp on job completion * Store started timestamp on job completion
* Set UTF-8 mode on Pg database connection * Set UTF-8 mode on Pg database connection
* Add netdisco-rancid-export to installed scripts * Add netdisco-rancid-export to installed scripts
* Template INCLUDE path stuffing broken for plugins [#103]
2.027007 - 2014-05-27 2.027007 - 2014-05-27

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

@@ -48,6 +48,10 @@ if (setting('extra_web_plugins') and ref [] eq ref setting('extra_web_plugins'))
_load_web_plugins( setting('extra_web_plugins') ); _load_web_plugins( setting('extra_web_plugins') );
} }
# after plugins are loaded, add our own template path
push @{ config->{engines}->{netdisco_template_toolkit}->{INCLUDE_PATH} },
setting('views');
# workaround for https://github.com/PerlDancer/Dancer/issues/935 # workaround for https://github.com/PerlDancer/Dancer/issues/935
hook after_error_render => sub { setting('layout' => 'main') }; hook after_error_render => sub { setting('layout' => 'main') };

7
Netdisco/lib/App/Netdisco/Web/Plugin.pm
View File

@@ -21,7 +21,7 @@ set(
); );
# this is what Dancer::Template::TemplateToolkit does by default # this is what Dancer::Template::TemplateToolkit does by default
config->{engines}->{template_toolkit}->{INCLUDE_PATH} ||= [ setting('views') ]; config->{engines}->{netdisco_template_toolkit}->{INCLUDE_PATH} ||= [ setting('views') ];
register 'register_template_path' => sub { register 'register_template_path' => sub {
my ($self, $path) = plugin_args(@_); my ($self, $path) = plugin_args(@_);
@@ -30,9 +30,8 @@ register 'register_template_path' => sub {
return error "bad template path to register_template_paths"; return error "bad template path to register_template_paths";
} }
unshift push @{ config->{engines}->{netdisco_template_toolkit}->{INCLUDE_PATH} },
@{ config->{engines}->{template_toolkit}->{INCLUDE_PATH} }, dir($path, 'views')->stringify;
$path, dir($path, 'views')->stringify;
}; };
sub _register_include { sub _register_include {

23
Netdisco/lib/Dancer/Template/NetdiscoTemplateToolkit.pm Normal file
View File

@@ -0,0 +1,23 @@
package Dancer::Template::NetdiscoTemplateToolkit;
use strict;
use warnings;
use Dancer::FileUtils 'path';
use base 'Dancer::Template::TemplateToolkit';
sub view {
my ($self, $view) = @_;
foreach my $path (@{ $self->config->{INCLUDE_PATH} }) {
foreach my $template ($self->_template_name($view)) {
my $view_path = path($path, $template);
return $view_path if -f $view_path;
}
}
# No matching view path was found
return;
}
1;

4
Netdisco/share/config.yml
View File

@@ -219,7 +219,7 @@ warnings: false
show_errors: false show_errors: false
logger: 'console' logger: 'console'
engines: engines:
template_toolkit: netdisco_template_toolkit:
encoding: 'utf8' encoding: 'utf8'
start_tag: '[%' start_tag: '[%'
end_tag: '%]' end_tag: '%]'
@@ -235,7 +235,7 @@ plugins:
provider: 'App::Netdisco::Web::Auth::Provider::DBIC' provider: 'App::Netdisco::Web::Auth::Provider::DBIC'
schema_name: 'netdisco' schema_name: 'netdisco'
session: 'YAML' session: 'YAML'
template: 'template_toolkit' template: 'netdisco_template_toolkit'
route_cache: true route_cache: true
appname: 'Netdisco' appname: 'Netdisco'
behind_proxy: false behind_proxy: false