projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Auftrags-Controller: Preisquellen bei Erneuern von Positionen aus Stammdaten …
[kivitendo-erp.git]
/
SL
/
Controller
/
Project.pm
diff --git
a/SL/Controller/Project.pm
b/SL/Controller/Project.pm
index
72f9bd4
..
702db89
100644
(file)
--- a/
SL/Controller/Project.pm
+++ b/
SL/Controller/Project.pm
@@
-120,10
+120,14
@@
sub action_ajax_autocomplete {
$::form->{sort_by} = 'customer_and_description';
$::form->{sort_by} = 'customer_and_description';
+ my $description_style = ($::form->{description_style} =~ m{both|number|description|full})
+ ? $::form->{description_style}
+ : 'full';
+
my @hashes = map {
+{
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,
id => $_->id,
projectnumber => $_->projectnumber,
description => $_->description,
@@
-244,6
+248,7
@@
sub display_form {
CVar->render_inputs(variables => $params{CUSTOM_VARIABLES}) if @{ $params{CUSTOM_VARIABLES} };
CVar->render_inputs(variables => $params{CUSTOM_VARIABLES}) if @{ $params{CUSTOM_VARIABLES} };
+ $::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);
$self->setup_edit_action_bar(callback => $params{callback});
$self->render('project/form', %params);