[Jifty-commit] r4043 - in jifty/trunk: lib/Jifty

[jifty-commit at lists.jifty.org]

Author: falcone
Date: Tue Sep  4 15:13:10 2007
New Revision: 4043

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/lib/Jifty/ClassLoader.pm

Log:
 r24400 at ketch:  falcone | 2007-09-04 15:10:44 -0400
 * revert changes to ClassLoader.  Collection classes are failing to be generated
   in some TD views


Modified: jifty/trunk/lib/Jifty/ClassLoader.pm
==============================================================================
--- jifty/trunk/lib/Jifty/ClassLoader.pm	(original)
+++ jifty/trunk/lib/Jifty/ClassLoader.pm	Tue Sep  4 15:13:10 2007
@@ -180,17 +180,10 @@
     
     # Autogenerate the Collection class for a Model
     elsif ( $module =~ /^(?:$base)::Model::([^\.]+)Collection$/ ) {
-        my $modelclass = $base .'::Model::'. $1;
-        Jifty::Util->require($modelclass);
-        unless ( eval { $modelclass->isa('Jifty::Record') } ) {
-            warn "There is no model for collection $module";
-            return undef;
-        }
-
         return $self->return_class(
                   "package $module;\n"
                 . "use base qw/@{[$base]}::Collection/;\n"
-                . "sub record_class { '$modelclass' }\n"
+                . "sub record_class { '@{[$base]}::Model::$1' }\n"
                 . "sub _autogenerated { 1 };\n"
             );
     }