__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';
}
$::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'),
)->save;
}
- $self->action_login;
+ $self->action_login unless $scripts_applied;
}
#
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);
my $version = SL::Version->get_version;
- $self->render('admin/adminlogin', title => t8('kivitendo v#1 administration', $version), %params, version => $version, logo_url => $::form->read_logo );
+ $self->render('admin/adminlogin', title => t8('kivitendo v#1 administration', $version), %params, version => $version );
}
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 {