applied peters fix for bug # 14566

git-svn-id: http://svn.maypole.perl.org/Maypole/trunk@392 48953598-375a-da11-a14b-00016c27c3ee

diff --git a/Changes b/Changes
index e8706ad404372590f657d7028421ccd4d612a73c..ebc146beff7d6d20eca105620c35c991f408e10e 100644 (file)
--- a/Changes
+++ b/Changes
@@ -16,7 +16,10 @@ For information about current developments and future releases, see:
     add() alias to push() in Mp::Headers (wishlist 14142)
     Fixed inheritance issues in Mp::Application - Mp::App now manipulates the caller's 
         @ISA directly, and doesn't inject itself into the chain (bugs 12923 & 14120)
+    Added new path processing methods for ssl and default table/action
     Moved ar accessor to Apache::MVC (bug 14014)
+    Refactored core to support further development in 2.11 and onwards
+    Fixed related_class method (bug 14566)
 
 2.10 Tue 19 Jul 2005
     Multiple Template Paths added ( http://rt.cpan.org/NoAuth/Bug.html?id=13447 )

diff --git a/MANIFEST b/MANIFEST
index 6647351a206ed61612a1bcae8cd04bd5e8af4f4d..5f23cefe065c3b0d6792bd46ea0cd40aba7fd189 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,5 +1,6 @@
 Changes
 ex/BeerDB.pm
+ex/beerdb.sql
 lib/Apache/MVC.pm
 lib/CGI/Maypole.pm
 lib/Maypole.pm

diff --git a/lib/Maypole/Model/CDBI.pm b/lib/Maypole/Model/CDBI.pm
index c80a2902e0ad69cd74bb507a4abd56d43dfbb25a..8de426a7ff409e610b94afaea9b978da39e3a678 100644 (file)
--- a/lib/Maypole/Model/CDBI.pm
+++ b/lib/Maypole/Model/CDBI.pm
@@ -85,21 +85,25 @@ sub related {
 }
 
 sub related_class {
-    my ( $self, $r, $accessor ) = @_;
+     my ( $self, $r, $accessor ) = @_;
+     my $meta = $self->meta_info;
+     my @rels = keys %$meta;
+     my $related;
+     foreach (@rels) {
+         $related = $meta->{$_}{$accessor};
+         last if $related;
+     }
+     return unless $related;
+
+     my $mapping = $related->{args}->{mapping};
+     if ( $mapping and @$mapping ) {
+       return $related->{foreign_class}->meta_info('has_a')->{$$mapping[0]}->{foreign_class};
+     }
+     else {
+         return $related->{foreign_class};
+     }
+ }
 
-    my $related = $self->meta_info( has_many => $accessor ) ||
-                  $self->meta_info( has_a    => $accessor ) ||
-                  return;
-
-    my $mapping = $related->{args}->{mapping} || [];
-    if ( @$mapping ) {
-        return $related->{foreign_class}->meta_info('has_a')->{ $$mapping[0] }
-          ->{foreign_class};
-    }
-    else {
-        return $related->{foreign_class};
-    }
-}
 
 sub do_edit : Exported {
     my ( $self, $r ) = @_;