X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/954eb9c0ecad0e5acf697e39ea0ad1418bd7cca9..eeb5375ee7727c956cc357cc8f90b19d1bfe80b9:/SL/Controller/Project.pm diff --git a/SL/Controller/Project.pm b/SL/Controller/Project.pm index 72f9bd4b2..351c5d35a 100644 --- a/SL/Controller/Project.pm +++ b/SL/Controller/Project.pm @@ -120,10 +120,14 @@ sub action_ajax_autocomplete { $::form->{sort_by} = 'customer_and_description'; + my $description_style = ($::form->{description_style} =~ m{both|number|description|full}) + ? $::form->{description_style} + : 'full'; + my @hashes = map { +{ - value => $_->full_description(style => 'full'), - label => $_->full_description(style => 'full'), + value => $_->full_description(style => $description_style), + label => $_->full_description(style => $description_style), id => $_->id, projectnumber => $_->projectnumber, description => $_->description, @@ -244,6 +248,7 @@ sub display_form { CVar->render_inputs(variables => $params{CUSTOM_VARIABLES}) if @{ $params{CUSTOM_VARIABLES} }; + $::request->layout->use_javascript("$_.js") for qw(kivi.File ckeditor5/ckeditor ckeditor5/translations/de); $self->setup_edit_action_bar(callback => $params{callback}); $self->render('project/form', %params); @@ -299,8 +304,9 @@ sub prepare_report { my $callback = $self->models->get_callback; - my $report = SL::ReportGenerator->new(\%::myconfig, $::form); - $self->{report} = $report; + my $report = SL::ReportGenerator->new(\%::myconfig, $::form); + $report->{title} = t8('Projects'); + $self->{report} = $report; my @columns = qw(project_status customer projectnumber description active valid project_type); my @sortable = qw(projectnumber description customer project_type project_status);