CSS/JS: Git-Revision von HEAD als GET-Parameter verwenden

[kivitendo-erp.git] / SL / ReportGenerator.pm

diff --git a/SL/ReportGenerator.pm b/SL/ReportGenerator.pm
index a62f0e4..75180a9 100644 (file)
--- a/SL/ReportGenerator.pm
+++ b/SL/ReportGenerator.pm
@@ -165,7 +165,9 @@ sub set_options {
 
   while (my ($key, $value) = each %options) {
     if ($key eq 'pdf_export') {
-      map { $self->{options}->{pdf_export}->{$_} = $value->{$_} } keys %{ $value };
+      $self->{options}->{pdf_export}->{$_} = $value->{$_} for keys %{ $value };
+    } elsif ($key eq 'csv_export') {
+      $self->{options}->{csv_export}->{$_} = $value->{$_} for keys %{ $value };
     } else {
       $self->{options}->{$key} = $value;
     }
@@ -415,8 +417,8 @@ sub prepare_html_content {
   return $variables;
 }
 
-sub setup_action_bar {
-  my ($self, $action_bar, $variables) = @_;
+sub create_action_bar_actions {
+  my ($self, $variables) = @_;
 
   my @actions;
   foreach my $type (qw(pdf csv)) {
@@ -441,8 +443,21 @@ sub setup_action_bar {
     );
   }
 
-  $action_bar = ($::request->layout->get('actionbar'))[0] unless blessed($action_bar);
-  $action_bar->add(@actions) if @actions;
+  return @actions;
+}
+
+sub setup_action_bar {
+  my ($self, $variables, %params) = @_;
+
+  my @actions = $self->create_action_bar_actions($variables);
+
+  if ($params{action_bar_setup_hook}) {
+    $params{action_bar_setup_hook}->(@actions);
+
+  } elsif (@actions) {
+    my $action_bar = blessed($params{action_bar}) ? $params{action_bar} : ($::request->layout->get('actionbar'))[0];
+    $action_bar->add(@actions);
+  }
 }
 
 sub generate_html_content {
@@ -452,7 +467,7 @@ sub generate_html_content {
 
   my $variables = $self->prepare_html_content(%params);
 
-  $self->setup_action_bar($params{action_bar}, $variables) if $params{action_bar};
+  $self->setup_action_bar($variables, %params) if $params{action_bar};
 
   my $stuff  = $self->{form}->parse_html_template($self->{options}->{html_template}, $variables);
   return $stuff;