X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FProject.pm;h=702db890788a452ae68ae8771d65b57f5d7829e1;hb=a27846ef2756ed0f59c29d256a5d43d6caaf0b58;hp=ba460c597ed9af63456f3d28453a41d74bb32dc9;hpb=ebe30b2d09629c061b8df6f3018adca7595a75d1;p=kivitendo-erp.git

diff --git a/SL/Controller/Project.pm b/SL/Controller/Project.pm
index ba460c597..702db8907 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,7 +248,7 @@ sub display_form {
 
   CVar->render_inputs(variables => $params{CUSTOM_VARIABLES}) if @{ $params{CUSTOM_VARIABLES} };
 
-  $::request->layout->use_javascript('kivi.File.js');
+  $::request->layout->use_javascript("$_.js") for qw(kivi.File ckeditor/ckeditor ckeditor/adapters/jquery);
   $self->setup_edit_action_bar(callback => $params{callback});
 
   $self->render('project/form', %params);