Fixed search for related columns overwriting existing params in generate_column_param...

[catagits/Catalyst-Controller-DBIC-API.git] / lib / Catalyst / Controller / DBIC / API / RPC.pm

diff --git a/lib/Catalyst/Controller/DBIC/API/RPC.pm b/lib/Catalyst/Controller/DBIC/API/RPC.pm
index 9655497..b3b17c3 100644 (file)
--- a/lib/Catalyst/Controller/DBIC/API/RPC.pm
+++ b/lib/Catalyst/Controller/DBIC/API/RPC.pm
@@ -5,7 +5,7 @@ use Moose;
 BEGIN { extends 'Catalyst::Controller::DBIC::API'; }
 
 __PACKAGE__->config(
-    'action'    => { object => { PathPart => 'id' } }, 
+    'action'    => { object_with_id => { PathPart => 'id' } },
     'default'   => 'application/json',
     'stash_key' => 'response',
     'map'       => {
@@ -16,7 +16,7 @@ __PACKAGE__->config(
 
 =head1 DESCRIPTION
 
-Provides an RPC API interface to the functionality described in L<Catalyst::Controller::DBIC::API>. 
+Provides an RPC API interface to the functionality described in L<Catalyst::Controller::DBIC::API>.
 
 By default provides the following endpoints:
 
@@ -37,7 +37,7 @@ CaptureArgs: 0
 As described in L<Catalyst::Controller::DBIC::API/setup>, this action is the chain root of the controller but has no pathpart or chain parent defined by default, so these must be defined in order for the controller to function. The neatest way is normally to define these using the controller's config.
 
   __PACKAGE__->config
-    ( action => { setup => { PathPart => 'track', Chained => '/api/rpc/rpc_base' } }, 
+    ( action => { setup => { PathPart => 'track', Chained => '/api/rpc/rpc_base' } },
        ...
   );
 
@@ -52,7 +52,7 @@ sub index : Chained('setup') PathPart('') Args(0) {
 
 =method_protected create
 
-Chained: L</object_no_id>
+Chained: L</objects_no_id>
 PathPart: create
 CaptureArgs: 0
 
@@ -60,10 +60,10 @@ Provides an endpoint to the functionality described in L<Catalyst::Controller::D
 
 =cut
 
-sub create :Chained('object_no_id') :PathPart('create') :Args(0)
+sub create :Chained('objects_no_id') :PathPart('create') :Args(0)
 {
        my ($self, $c) = @_;
-    $c->forward('update_or_create');
+    $self->update_or_create($c);
 }
 
 =method_protected list
@@ -76,10 +76,10 @@ Provides an endpoint to the functionality described in L<Catalyst::Controller::D
 
 =cut
 
-sub list :Chained('deserialize') :PathPart('list') :Args(0) {
+sub list :Chained('deserialize') :PathPart('list') :Args(0)
+{
        my ($self, $c) = @_;
-
-        $self->next::method($c);
+    $self->next::method($c);
 }
 
 =method_protected item
@@ -92,10 +92,10 @@ Provides an endpoint to the functionality described in L<Catalyst::Controller::D
 
 =cut
 
-sub item :Chained('object_with_id') :PathPart('') :Args(0) {
+sub item :Chained('object_with_id') :PathPart('') :Args(0)
+{
     my ($self, $c) = @_;
-
-    $c->forward('view');
+    $self->next::method($c);
 }
 
 =method_protected update
@@ -108,10 +108,10 @@ Provides an endpoint to the functionality described in L<Catalyst::Controller::D
 
 =cut
 
-sub update :Chained('object_with_id') :PathPart('update') :Args(0) {
+sub update :Chained('object_with_id') :PathPart('update') :Args(0)
+{
     my ($self, $c) = @_;
-
-    $c->forward('update_or_create');
+    $self->update_or_create($c);
 }
 
 =method_protected delete
@@ -132,7 +132,7 @@ sub delete :Chained('object_with_id') :PathPart('delete') :Args(0)
 
 =method_protected update_bulk
 
-Chained: L</object_no_id>
+Chained: L</objects_no_id>
 PathPart: update
 Args: 0
 
@@ -140,15 +140,15 @@ Provides an endpoint to the functionality described in L<Catalyst::Controller::D
 
 =cut
 
-sub update_bulk :Chained('object_no_id') :PathPart('update') :Args(0)
+sub update_bulk :Chained('objects_no_id') :PathPart('update') :Args(0)
 {
     my ($self, $c) = @_;
-    $c->forward('update_or_create');
+    $self->update_or_create($c);
 }
 
 =method_protected delete_bulk
 
-Chained: L</object_no_id>
+Chained: L</objects_no_id>
 PathPart: delete
 Args: 0
 
@@ -156,7 +156,7 @@ Provides an endpoint to the functionality described in L<Catalyst::Controller::D
 
 =cut
 
-sub delete_bulk :Chained('object_no_id') :PathPart('delete') :Args(0)
+sub delete_bulk :Chained('objects_no_id') :PathPart('delete') :Args(0)
 {
     my ($self, $c) = @_;
     $self->next::method($c);