X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Ffu.pl;h=202a9d8068dbae13358ae7f9954bc0ad3b4a7f78;hb=ea84a15a3674ac95d9002eae9c77bacf392a8af0;hp=7c78dd7ed2fffda2b80f0980a7ee42dd772dc723;hpb=7a7f33b5c1b3531ab761adba1cf19d4ad68cffcd;p=kivitendo-erp.git

diff --git a/bin/mozilla/fu.pl b/bin/mozilla/fu.pl
index 7c78dd7ed..202a9d806 100644
--- a/bin/mozilla/fu.pl
+++ b/bin/mozilla/fu.pl
@@ -93,7 +93,7 @@ sub save_follow_up {
   $form->isblank('follow_up_date',   $locale->text('The follow-up date is missing.'));
   $form->isblank('subject',          $locale->text('The subject is missing.'));
 
-  my %params = (map({ $_ => $form->{$_} } qw(id subject body created_for_user follow_up_date)), 'done' => 0);
+  my %params = (map({ $_ => $form->{$_} } qw(id subject body note_id created_for_user follow_up_date)), 'done' => 0);
 
   _collect_links(\%params);
 
@@ -205,6 +205,8 @@ sub report {
 
   my @report_params = qw(created_for subject body reference follow_up_date_from follow_up_date_to itime_from itime_to due_only all_users done not_done);
 
+  report_generator_set_default_sort('follow_up_date', 1);
+
   my $follow_ups    = FU->follow_ups(map { $_ => $form->{$_} } @report_params);
   $form->{rowcount} = scalar @{ $follow_ups };
 
@@ -222,6 +224,12 @@ sub report {
   );
 
   my @columns = qw(selected follow_up_date created_on subject title created_by_name created_for_user_name done);
+  my $href    = build_std_url('action=report', grep { $form->{$_} } @report_params);
+
+  foreach my $name (qw(follow_up_date created_on title subject)) {
+    my $sortdir                 = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir};
+    $column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir";
+  }
 
   my @options;
 
@@ -251,9 +259,9 @@ sub report {
   $report->set_columns(%column_defs);
   $report->set_column_order(@columns);
 
-  $report->set_export_options('report', @report_params);
+  $report->set_export_options('report', @report_params, qw(sort sortdir));
 
-  $report->set_sort_indicator('follow_up_date', 1);
+  $report->set_sort_indicator($form->{sort}, $form->{sortdir});
 
   $report->set_options('raw_top_info_text'    => $form->parse_html_template('fu/report_top',    { 'OPTIONS' => \@options }),
                        'raw_bottom_info_text' => $form->parse_html_template('fu/report_bottom', { 'HIDDEN'  => \@hidden_report_params }),