Updated changes to Maypole::Application

[maypole.git] / lib / Maypole.pm

diff --git a/lib/Maypole.pm b/lib/Maypole.pm
index b4e1d623ac3d2276127dd9fb16ef5c00adc2b3e2..7ab6cb31f6d058146f4fc5ba518f8652aec98625 100644 (file)
--- a/lib/Maypole.pm
+++ b/lib/Maypole.pm
@@ -130,13 +130,15 @@ sub is_applicable {
     $config->ok_tables || $config->ok_tables( $config->display_tables );
     $config->ok_tables( { map { $_ => 1 } @{ $config->ok_tables } } )
       if ref $config->ok_tables eq "ARRAY";
     $config->ok_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})"
+    warn "We don't have that table ($self->{table}).\n"
+      . "Available tables are: "
+      . join( ",", @{ $config->{display_tables} } )

       if $self->debug
       and not $config->ok_tables->{ $self->{table} };
     return DECLINED() unless exists $config->ok_tables->{ $self->{table} };
 
     # Is it public?
       if $self->debug
       and not $config->ok_tables->{ $self->{table} };
     return DECLINED() unless exists $config->ok_tables->{ $self->{table} };
 
     # Is it public?

-    return DECLINED unless $r->model_class->is_public( $r->{action} );
+    return DECLINED unless $self->model_class->is_public( $self->{action} );

     return OK();
 }
 
     return OK();
 }
 


@@ -171,6 +173,8 @@ sub authenticate { return OK }
 
 sub exception { return ERROR }
 
 
 sub exception { return ERROR }
 

+sub rewrite_path { }
+

 sub parse_path {
     my $self = shift;
     $self->{path} ||= "frontpage";
 sub parse_path {
     my $self = shift;
     $self->{path} ||= "frontpage";


@@ -404,7 +408,7 @@ Simon Cozens, C<simon@cpan.org>
 
 =head1 THANK YOU
 
 
 =head1 THANK YOU
 

-Danijel Milicevic, Jesse Scheidlower, Jody Belka, Marcus Ramberg,
+Danijel Milicevic, Jesse Sheidlower, Jody Belka, Marcus Ramberg,

 Mickael Joanne, Simon Flack, Veljko Vidovic and all the others who've
 helped.
 
 Mickael Joanne, Simon Flack, Veljko Vidovic and all the others who've
 helped.