diff options
author | groditi <groditi@03d0b0b2-0e1a-0410-a411-fdb2f4bd65d7> | 2009-12-15 21:07:26 +0000 |
---|---|---|
committer | groditi <groditi@03d0b0b2-0e1a-0410-a411-fdb2f4bd65d7> | 2009-12-15 21:07:26 +0000 |
commit | a4f3b11acc91b2ce5a9d89a642c80537697f40d0 (patch) | |
tree | a59e31caa7e47f29fff708e7312fc42f72228921 /lib/Reaction/UI/Controller | |
parent | 273d286edc1da92d568fdb9a77b215f08e7120ff (diff) | |
parent | 90bcd4d7fddc86d573c0cfc5d84e126ed1df2a83 (diff) | |
download | reaction-a4f3b11acc91b2ce5a9d89a642c80537697f40d0.tar.gz reaction-a4f3b11acc91b2ce5a9d89a642c80537697f40d0.zip |
r32221@martha (orig r1249): groditi | 2009-10-22 14:24:11 -0400
first part of fix for attributes and roles mess. metclass coompat bug still lurks
Diffstat (limited to 'lib/Reaction/UI/Controller')
-rw-r--r-- | lib/Reaction/UI/Controller/Collection.pm | 2 | ||||
-rw-r--r-- | lib/Reaction/UI/Controller/Collection/CRUD.pm | 2 | ||||
-rw-r--r-- | lib/Reaction/UI/Controller/Collection/CRUD/Search.pm | 3 | ||||
-rw-r--r-- | lib/Reaction/UI/Controller/Role/Action/Simple.pm | 2 | ||||
-rw-r--r-- | lib/Reaction/UI/Controller/Root.pm | 3 |
5 files changed, 7 insertions, 5 deletions
diff --git a/lib/Reaction/UI/Controller/Collection.pm b/lib/Reaction/UI/Controller/Collection.pm index 38cd61d..15245f4 100644 --- a/lib/Reaction/UI/Controller/Collection.pm +++ b/lib/Reaction/UI/Controller/Collection.pm @@ -1,7 +1,7 @@ package Reaction::UI::Controller::Collection; -use base 'Reaction::UI::Controller'; use Reaction::Class; +BEGIN { extends 'Reaction::UI::Controller'; } use aliased 'Reaction::UI::ViewPort::Collection::Grid'; diff --git a/lib/Reaction/UI/Controller/Collection/CRUD.pm b/lib/Reaction/UI/Controller/Collection/CRUD.pm index bebfc75..f37790d 100644 --- a/lib/Reaction/UI/Controller/Collection/CRUD.pm +++ b/lib/Reaction/UI/Controller/Collection/CRUD.pm @@ -1,7 +1,7 @@ package Reaction::UI::Controller::Collection::CRUD; -use base 'Reaction::UI::Controller::Collection'; use Reaction::Class; +BEGIN { extends 'Reaction::UI::Controller::Collection'; } use aliased 'Reaction::UI::ViewPort::ListView'; diff --git a/lib/Reaction/UI/Controller/Collection/CRUD/Search.pm b/lib/Reaction/UI/Controller/Collection/CRUD/Search.pm index e9d467d..a9aa15f 100644 --- a/lib/Reaction/UI/Controller/Collection/CRUD/Search.pm +++ b/lib/Reaction/UI/Controller/Collection/CRUD/Search.pm @@ -1,6 +1,7 @@ package Reaction::UI::Controller::Collection::CRUD::Search; -use parent 'Reaction::UI::Controller::Collection::CRUD'; + use Reaction::Class; +BEGIN { extends 'Reaction::UI::Controller::Collection::CRUD'; } use aliased 'Reaction::UI::ViewPort::SearchableListViewContainer'; diff --git a/lib/Reaction/UI/Controller/Role/Action/Simple.pm b/lib/Reaction/UI/Controller/Role/Action/Simple.pm index bf5ba16..351d124 100644 --- a/lib/Reaction/UI/Controller/Role/Action/Simple.pm +++ b/lib/Reaction/UI/Controller/Role/Action/Simple.pm @@ -15,7 +15,7 @@ sub _build_action_viewport_args { {} } sub setup_viewport { my ($self, $c, $vp_args) = @_; my $action_name = $c->stack->[-1]->name; - my $vp = $self->action_viewport_map->{$action_name}, + my $vp = $self->action_viewport_map->{$action_name}; my $args = $self->merge_config_hashes( $vp_args || {}, $self->action_viewport_args->{$action_name} || {} , diff --git a/lib/Reaction/UI/Controller/Root.pm b/lib/Reaction/UI/Controller/Root.pm index eb0e3b5..bea629c 100644 --- a/lib/Reaction/UI/Controller/Root.pm +++ b/lib/Reaction/UI/Controller/Root.pm @@ -1,9 +1,10 @@ package Reaction::UI::Controller::Root; -use base qw/Reaction::UI::Controller/; use Reaction::Class; use Reaction::UI::Window; +BEGIN { extends 'Reaction::UI::Controller'; } + __PACKAGE__->config( view_name => 'XHTML', content_type => 'text/html', |