X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FMaypole.pm;h=6cecb930166c2e323ea60a8c459b39c97bc723ba;hb=2ad3790d146c6ebc8d690f312a6d525e0146d092;hp=70bfd0b277f65bd7c94336240387799f29293003;hpb=829074e50fdf5ad9a383234a676f115d4f8b4c5a;p=maypole.git diff --git a/lib/Maypole.pm b/lib/Maypole.pm index 70bfd0b..6cecb93 100644 --- a/lib/Maypole.pm +++ b/lib/Maypole.pm @@ -4,7 +4,7 @@ use attributes (); use UNIVERSAL::require; use strict; use warnings; -our $VERSION = "1.3"; +our $VERSION = "1.5"; __PACKAGE__->mk_classdata($_) for qw( config init_done view_object ); __PACKAGE__->mk_accessors ( qw( ar params query objects model_class args action template )); @@ -76,7 +76,6 @@ sub handler_guts { $r->model_class->process($r); } else { # Otherwise, it's just a plain template. - $r->call_authenticate; # No harm in it delete $r->{model_class}; $r->{path} =~ s{/}{}; # De-absolutify $r->template($r->{path}); @@ -89,7 +88,9 @@ sub handler_guts { sub is_applicable { my $self = shift; my $config = $self->config; - $config->{ok_tables} = {map {$_ => 1} @{$config->{display_tables}}}; + $config->{ok_tables} ||= $config->{display_tables}; + $config->{ok_tables} = {map {$_=>1} @{$config->{ok_tables}}} + if ref $config->{ok_tables} eq "ARRAY"; warn "We don't have that table ($self->{table})" if $self->debug and not $config->{ok_tables}{$self->{table}}; return DECLINED() unless exists $config->{ok_tables}{$self->{table}};