[Jifty-commit] r6027 - in JiftyX-ModelHelpers/trunk: lib/JiftyX t/Simapp/t
Jifty commits
jifty-commit at lists.jifty.org
Sat Nov 22 03:11:13 EST 2008
Author: gugod
Date: Sat Nov 22 03:11:12 2008
New Revision: 6027
Modified:
JiftyX-ModelHelpers/trunk/ (props changed)
JiftyX-ModelHelpers/trunk/lib/JiftyX/ModelHelpers.pm
JiftyX-ModelHelpers/trunk/t/Simapp/t/m-helper.t
Log:
r25018 at yra: gugod | 2008-11-22 16:10:43 +0800
Fix a special case where the collection returned is not "unlimited"
when there are no paramebers passed to M method.
Modified: JiftyX-ModelHelpers/trunk/lib/JiftyX/ModelHelpers.pm
==============================================================================
--- JiftyX-ModelHelpers/trunk/lib/JiftyX/ModelHelpers.pm (original)
+++ JiftyX-ModelHelpers/trunk/lib/JiftyX/ModelHelpers.pm Sat Nov 22 03:11:12 2008
@@ -8,9 +8,12 @@
our @EXPORT = qw(M);
sub M {
- my ($model, @params) = @_;;
-
- return Jifty->app_class(Model => $model)->new() unless @params;
+ my ($model, @params) = @_;
+ unless (@params) {
+ my $record = Jifty->app_class(Model => $model)->new();
+ $record->unlimit if index($model, "Collection") > 0;
+ return $record;
+ }
my $params_to_new = pop @params;
unless (ref($params_to_new) eq 'HASH') {
@@ -33,6 +36,9 @@
$record->load_by_cols(@params);
}
}
+ else {
+ $record->unlimit if index($model, "Collection") > 0;
+ }
return $record;
}
Modified: JiftyX-ModelHelpers/trunk/t/Simapp/t/m-helper.t
==============================================================================
--- JiftyX-ModelHelpers/trunk/t/Simapp/t/m-helper.t (original)
+++ JiftyX-ModelHelpers/trunk/t/Simapp/t/m-helper.t Sat Nov 22 03:11:12 2008
@@ -2,7 +2,7 @@
use warnings;
use strict;
-use Jifty::Test::Dist tests => 10;
+use Jifty::Test::Dist tests => 11;
use JiftyX::ModelHelpers qw(M);
use Simapp::Model::Book;
@@ -28,6 +28,7 @@
{
my $b = M("BookCollection");
is( ref($b), "Simapp::Model::BookCollection" );
+ is($b->count, 1, "There is one book in the collections so far.");
}
{
More information about the Jifty-commit
mailing list