[Catalyst-commits] r12289 - in Catalyst-Controller-DBIC-API/1.003: . branches/moosify-validation-configurability/lib/Catalyst/Controller/DBIC/API

[nperez at dev.catalyst.perl.org]

Author: nperez
Date: 2009-12-10 09:30:12 +0000 (Thu, 10 Dec 2009)
New Revision: 12289

Modified:
   Catalyst-Controller-DBIC-API/1.003/
   Catalyst-Controller-DBIC-API/1.003/branches/moosify-validation-configurability/lib/Catalyst/Controller/DBIC/API/Base.pm
Log:
 r4256 at nicklaptop:  nicholas | 2009-12-10 03:29:01 -0600
 Update response structure to actually use $self->data_root



Property changes on: Catalyst-Controller-DBIC-API/1.003
___________________________________________________________________
Name: svk:merge
   - 4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Controller-DBIC-API/1.001:9528
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Controller-DBIC-API/1.002:9762
992f488a-d630-404b-95f9-f7d0fdf28443:/local/ccda:4254
   + 4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Controller-DBIC-API/1.001:9528
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Controller-DBIC-API/1.002:9762
992f488a-d630-404b-95f9-f7d0fdf28443:/local/ccda:4256

Modified: Catalyst-Controller-DBIC-API/1.003/branches/moosify-validation-configurability/lib/Catalyst/Controller/DBIC/API/Base.pm
===================================================================
--- Catalyst-Controller-DBIC-API/1.003/branches/moosify-validation-configurability/lib/Catalyst/Controller/DBIC/API/Base.pm	2009-12-10 09:25:01 UTC (rev 12288)
+++ Catalyst-Controller-DBIC-API/1.003/branches/moosify-validation-configurability/lib/Catalyst/Controller/DBIC/API/Base.pm	2009-12-10 09:30:12 UTC (rev 12289)
@@ -221,7 +221,7 @@
 	my $rs = $c->stash->{$self->rs_stash_key}->search;
 	$rs->result_class('DBIx::Class::ResultClass::HashRefInflator');
     eval {
-	    $c->stash->{response}->{list} = [ $rs->all ];
+	    $c->stash->{response}->{$self->data_root} = [ $rs->all ];
     };
     if ($@) {
         $c->log->error($@);
@@ -395,7 +395,7 @@
 		$default_status = 200;
 	}
 	
-	delete $c->stash->{response}->{list} unless ($default_status == 200);
+	delete $c->stash->{response}->{$self->data_root} unless ($default_status == 200);
 	$c->res->status( $default_status || 200 );
 	$c->forward('serialize');
 }