projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'b-3.6.1' into mebil
[kivitendo-erp.git]
/
SL
/
Controller
/
Admin.pm
diff --git
a/SL/Controller/Admin.pm
b/SL/Controller/Admin.pm
index
e620089
..
c22fdca
100644
(file)
--- a/
SL/Controller/Admin.pm
+++ b/
SL/Controller/Admin.pm
@@
-592,6
+592,13
@@
sub use_multiselect_js {
return $self;
}
return $self;
}
+sub use_ckeditor_js {
+ my ($self) = @_;
+
+ $::request->{layout}->use_javascript("${_}.js") for qw(ckeditor/ckeditor ckeditor/adapters/jquery);
+ return $self;
+}
+
sub login_form {
my ($self, %params) = @_;
$::request->layout(SL::Layout::AdminLogin->new);
sub login_form {
my ($self, %params) = @_;
$::request->layout(SL::Layout::AdminLogin->new);
@@
-601,7
+608,7
@@
sub login_form {
sub edit_user_form {
my ($self, %params) = @_;
sub edit_user_form {
my ($self, %params) = @_;
- $self->use_multiselect_js->render('admin/edit_user', %params);
+ $self->use_multiselect_js->
use_ckeditor_js->
render('admin/edit_user', %params);
}
sub edit_client_form {
}
sub edit_client_form {