From dae2afe84c22b0043ea49fba5bc568675c6957c6 Mon Sep 17 00:00:00 2001 From: Thomas Heck Date: Thu, 6 Sep 2012 15:29:35 +0200 Subject: [PATCH] CVars beim Projekt-CSV-Export mit exportieren. fixt #1978 --- bin/mozilla/projects.pl | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/bin/mozilla/projects.pl b/bin/mozilla/projects.pl index 16d5e45f7..46ce822fb 100644 --- a/bin/mozilla/projects.pl +++ b/bin/mozilla/projects.pl @@ -119,8 +119,6 @@ sub project_report { my $report = SL::ReportGenerator->new(\%myconfig, $form); my @columns = qw(projectnumber description active); - my @hidden_vars = ('filter'); - my $href = build_std_url('action=project_report', @hidden_vars); my @includeable_custom_variables = grep { $_->{includeable} } @{ $cvar_configs }; my %column_defs_cvars = (); @@ -133,6 +131,11 @@ sub project_report { push @columns, map { "cvar_$_->{name}" } @includeable_custom_variables; + + my @hidden_vars = ('filter', map { ('cvar_'. $_->{name} , 'l_cvar_'. $_->{name}) } @includeable_custom_variables); + my $href = build_std_url('action=project_report', @hidden_vars); + + my %column_defs = ( 'projectnumber' => { 'text' => $locale->text('Number'), }, 'description' => { 'text' => $locale->text('Description'), }, @@ -150,6 +153,13 @@ sub project_report { $report->set_export_options('project_report', @hidden_vars, 'sort'); + CVar->add_custom_variables_to_report('module' => 'Project', + 'trans_id_field' => 'id', + 'configs' => $cvar_configs, + 'column_defs' => \%column_defs, + 'data' => $form->{project_list}, + ); + $report->set_sort_indicator($form->{sort}, 1); my @options; -- 2.20.1