pulling in changes from trunk

diff --git a/lib/Reaction/UI/Controller/Collection.pm b/lib/Reaction/UI/Controller/Collection.pm
index d907de4..2b35ac5 100644 (file)
--- a/lib/Reaction/UI/Controller/Collection.pm
+++ b/lib/Reaction/UI/Controller/Collection.pm
@@ -52,8 +52,7 @@ sub object :Chained('base') :PathPart('id') :CaptureArgs(1) {
 
 sub view :Chained('object') :Args(0) {
   my ($self, $c) = @_;
-  my $object :Stashed;
-  $c->forward(basic_page => [{model => $object}]);
+  $c->forward(basic_page => [{ model => $c->stash->{object} }]);
 }
 
 sub basic_page : Private {

diff --git a/lib/Reaction/UI/Controller/Collection/CRUD.pm b/lib/Reaction/UI/Controller/Collection/CRUD.pm
index 3d04c1f..877f118 100644 (file)
--- a/lib/Reaction/UI/Controller/Collection/CRUD.pm
+++ b/lib/Reaction/UI/Controller/Collection/CRUD.pm
@@ -96,9 +96,6 @@ sub basic_model_action :Private {
 
   my $cat_action_name = $c->stack->[-2]->name;
   my $im_action_name  = join('', (map{ ucfirst } split('_', $cat_action_name)));
-  $c->log->debug($cat_action_name);
-  $c->log->debug($self->action_viewport_map->{$cat_action_name});
-  $c->log->debug(keys %{$self->action_viewport_map});
   return $self->push_viewport
     (
      $self->action_viewport_map->{$cat_action_name},