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
0fd1566
..
c22fdca
100644
(file)
--- a/
SL/Controller/Admin.pm
+++ b/
SL/Controller/Admin.pm
@@
-31,7
+31,7
@@
__PACKAGE__->run_before(\&setup_layout);
__PACKAGE__->run_before(\&setup_client, only => [ qw(list_printers new_printer edit_printer save_printer delete_printer) ]);
sub get_auth_level { "admin" };
__PACKAGE__->run_before(\&setup_client, only => [ qw(list_printers new_printer edit_printer save_printer delete_printer) ]);
sub get_auth_level { "admin" };
-sub keep_auth_vars {
+sub keep_auth_vars
_in_form
{
my ($class, %params) = @_;
return $params{action} eq 'login';
}
my ($class, %params) = @_;
return $params{action} eq 'login';
}
@@
-84,10
+84,9
@@
sub action_create_auth_tables {
$::auth->set_session_value('admin_password', $::lx_office_conf{authentication}->{admin_password});
$::auth->create_or_refresh_session;
$::auth->set_session_value('admin_password', $::lx_office_conf{authentication}->{admin_password});
$::auth->create_or_refresh_session;
-
return if
$self->apply_dbupgrade_scripts;
+
my $scripts_applied =
$self->apply_dbupgrade_scripts;
- my $group = (SL::DB::Manager::AuthGroup->get_all(limit => 1))[0];
- if (!$group) {
+ if (! SL::DB::Manager::AuthGroup->get_all_count) {
SL::DB::AuthGroup->new(
name => t8('Full Access'),
description => t8('Full access to all functions'),
SL::DB::AuthGroup->new(
name => t8('Full Access'),
description => t8('Full access to all functions'),
@@
-95,7
+94,7
@@
sub action_create_auth_tables {
)->save;
}
)->save;
}
- $self->action_login;
+ $self->action_login
unless $scripts_applied
;
}
#
}
#
@@
-593,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);
@@
-602,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 {