[Catalyst-commits] r11818 - Catalyst-Controller-DBIC-API/1.003/trunk/lib/Catalyst/Controller/DBIC/API

[lukes at dev.catalyst.perl.org]

Author: lukes
Date: 2009-11-13 15:31:14 +0000 (Fri, 13 Nov 2009)
New Revision: 11818

Modified:
   Catalyst-Controller-DBIC-API/1.003/trunk/lib/Catalyst/Controller/DBIC/API/Base.pm
   Catalyst-Controller-DBIC-API/1.003/trunk/lib/Catalyst/Controller/DBIC/API/RPC.pm
Log:
fixes to make compatible with future version of C::C::Rest

Modified: Catalyst-Controller-DBIC-API/1.003/trunk/lib/Catalyst/Controller/DBIC/API/Base.pm
===================================================================
--- Catalyst-Controller-DBIC-API/1.003/trunk/lib/Catalyst/Controller/DBIC/API/Base.pm	2009-11-13 14:49:54 UTC (rev 11817)
+++ Catalyst-Controller-DBIC-API/1.003/trunk/lib/Catalyst/Controller/DBIC/API/Base.pm	2009-11-13 15:31:14 UTC (rev 11818)
@@ -47,7 +47,7 @@
 	my ($self, $c) = @_;
 
 	my $req_params;
-	if ($c->req->data) {
+	if ($c->req->data && scalar(keys %{$c->req->data})) {
 		$req_params = $c->req->data;
 	} else {
 		$req_params = $self->expand_hash($c->req->params);

Modified: Catalyst-Controller-DBIC-API/1.003/trunk/lib/Catalyst/Controller/DBIC/API/RPC.pm
===================================================================
--- Catalyst-Controller-DBIC-API/1.003/trunk/lib/Catalyst/Controller/DBIC/API/RPC.pm	2009-11-13 14:49:54 UTC (rev 11817)
+++ Catalyst-Controller-DBIC-API/1.003/trunk/lib/Catalyst/Controller/DBIC/API/RPC.pm	2009-11-13 15:31:14 UTC (rev 11818)
@@ -90,7 +90,7 @@
 	my ($self, $c) = @_;
 
 	$c->forward('deserialize');
-	$c->req->params($c->req->data);
+	$c->req->params($c->stash->{_dbic_api}->{req_params});
 }
 
 sub object :Chained('setup') :CaptureArgs(1) :PathPart('id') {