Manager/Project: custom filter und paginate default.

[mfinanz.git] / SL / Controller / Helper / GetModels.pm

diff --git a/SL/Controller/Helper/GetModels.pm b/SL/Controller/Helper/GetModels.pm
index e353657170a44bffdc7ea7940475027cd6627cad..821d7a19424997516397b6af39c3b11023067b82 100644 (file)
--- a/SL/Controller/Helper/GetModels.pm
+++ b/SL/Controller/Helper/GetModels.pm
@@ -7,7 +7,7 @@ our @EXPORT = qw(get_models_url_params get_callback get_models);
 
 use constant PRIV => '__getmodelshelperpriv';
 
 
 use constant PRIV => '__getmodelshelperpriv';
 

-my %registered_handlers = ( callback => [], get_models => [] );
+my $registered_handlers = {};

 
 sub register_get_models_handlers {
   my ($class, %additional_handlers) = @_;
 
 sub register_get_models_handlers {
   my ($class, %additional_handlers) = @_;


@@ -16,9 +16,8 @@ sub register_get_models_handlers {
   $only           = [ $only ] if !ref $only;
   my %hook_params = @{ $only } ? ( only => $only ) : ();
 
   $only           = [ $only ] if !ref $only;
   my %hook_params = @{ $only } ? ( only => $only ) : ();
 

-  $class->run_before(sub { $_[0]->{PRIV()} = { current_action => $_[1] }; }, %hook_params);
-
-  map { push @{ $registered_handlers{$_} }, $additional_handlers{$_} if $additional_handlers{$_} } keys %registered_handlers;
+  my $handlers    = _registered_handlers($class);
+  map { push @{ $handlers->{$_} }, $additional_handlers{$_} if $additional_handlers{$_} } keys %$handlers;

 }
 
 sub get_models_url_params {
 }
 
 sub get_models_url_params {


@@ -34,13 +33,13 @@ sub get_models_url_params {
     );
   };
 
     );
   };
 

-  push @{ $registered_handlers{callback} }, $callback;
+  push @{ _registered_handlers($class)->{callback} }, $callback;

 }
 
 sub get_callback {
   my ($self, %override_params) = @_;
 
 }
 
 sub get_callback {
   my ($self, %override_params) = @_;
 

-  my %default_params = _run_handlers($self, 'callback', action => ($self->{PRIV()} || {})->{current_action});
+  my %default_params = _run_handlers($self, 'callback', action => $self->action_name);

 
   return $self->url_for(%default_params, %override_params);
 }
 
   return $self->url_for(%default_params, %override_params);
 }


@@ -48,9 +47,8 @@ sub get_callback {
 sub get_models {
   my ($self, %override_params) = @_;
 
 sub get_models {
   my ($self, %override_params) = @_;
 

-  my %default_params           = _run_handlers($self, 'get_models');
+  my %params                   = _run_handlers($self, 'get_models', %override_params);

 
 

-  my %params                   = (%default_params, %override_params);

   my $model                    = delete($params{model}) || die "No 'model' to work on";
 
   return "SL::DB::Manager::${model}"->get_all(%params);
   my $model                    = delete($params{model}) || die "No 'model' to work on";
 
   return "SL::DB::Manager::${model}"->get_all(%params);


@@ -63,7 +61,7 @@ sub get_models {
 sub _run_handlers {
   my ($self, $handler_type, %params) = @_;
 
 sub _run_handlers {
   my ($self, $handler_type, %params) = @_;
 

-  foreach my $sub (@{ $registered_handlers{$handler_type} }) {
+  foreach my $sub (@{ _registered_handlers(ref $self)->{$handler_type} }) {

     if (ref $sub eq 'CODE') {
       %params = $sub->($self, %params);
     } elsif ($self->can($sub)) {
     if (ref $sub eq 'CODE') {
       %params = $sub->($self, %params);
     } elsif ($self->can($sub)) {


@@ -76,6 +74,10 @@ sub _run_handlers {
   return %params;
 }
 
   return %params;
 }
 

+sub _registered_handlers {
+  $registered_handlers->{$_[0]} //= { callback => [], get_models => [] }
+}
+

 1;
 __END__
 
 1;
 __END__