1 files changed, 21 insertions, 0 deletions
diff --git a/lib/ComponentUI/Controller/TestModel/Bar.pm b/lib/ComponentUI/Controller/TestModel/Bar.pm
index c649d78..4701fff 100644
--- a/lib/ComponentUI/Controller/TestModel/Bar.pm
+++ b/lib/ComponentUI/Controller/TestModel/Bar.pm
@@ -8,6 +8,7 @@ __PACKAGE__->config(
   collection_name => 'Bar',
   action => {
     base => { Chained => '/base', PathPart => 'testmodel/bar' },
+    create => { ViewPort => { layout => 'bar/create' } },
     list => {
       ViewPort => {
         enable_order_by => [qw/name foo published_at/],
@@ -32,7 +33,27 @@ sub create :Chained('base') {
   my $action_vp = $self->next::method(@_);
   my $self_uri = $c->uri_for($self->action_for('create'));
   $action_vp->action($self_uri);
+
+  my $params = $c->request->parameters;
+  if ( defined $params->{return_to_uri} && $params->{return_to_uri} ){
+    if( $params->{return_to_uri} ne $c->request->uri ){
+      $action_vp->layout_args->{return_to_uri} = $params->{return_to_uri};
+    }
+  } elsif( $c->request->referer ne $c->request->uri) {
+    $action_vp->layout_args->{return_to_uri} = $c->request->referer;
+  }
+
   return $action_vp;
 }
 
+sub on_create_close_callback {
+  my($self, $c, $vp) = @_;
+  if ( my $return_to_uri =  delete $c->request->parameters->{return_to_uri} ){
+    $c->response->redirect( $return_to_uri );
+  } else {
+    $self->redirect_to( $c, 'list' );
+  }
+  $c->detach;
+}
+
 1;