From 418d86ffec00a8c59fad0389878349a95df70c44 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bernd=20Ble=C3=9Fmann?= Date: Thu, 7 Jan 2016 10:50:30 +0100 Subject: [PATCH] =?utf8?q?Drucker=20im=20Adminbereich=20=C3=A4ndern=20-=20?= =?utf8?q?Bug=20behoben?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Im Drucker-Fall enthält $::form die Drucker-id in $::form->{id} und die client-ID in $::form->{client}->{id}, beim init_client Code für den Fall muß also erst auf id in $::form->{client}->{id} geprüft werden, ansonsten wird der Client mit der id des Druckers gesucht und nicht gefunden. Danke Geoffrey. --- SL/Controller/Admin.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SL/Controller/Admin.pm b/SL/Controller/Admin.pm index 94dfc6967..ab4e24fbb 100644 --- a/SL/Controller/Admin.pm +++ b/SL/Controller/Admin.pm @@ -490,7 +490,7 @@ sub action_lock_system { sub init_db_cfg { $::lx_office_conf{'authentication/database'} } sub init_is_locked { SL::System::InstallationLock->is_locked } -sub init_client { SL::DB::Manager::AuthClient->find_by(id => ($::form->{id} || ($::form->{client} || {})->{id})) } +sub init_client { SL::DB::Manager::AuthClient->find_by(id => (($::form->{client} || {})->{id} || $::form->{id})) } sub init_user { SL::DB::AuthUser ->new(id => ($::form->{id} || ($::form->{user} || {})->{id}))->load } sub init_group { SL::DB::AuthGroup ->new(id => ($::form->{id} || ($::form->{group} || {})->{id}))->load } sub init_printer { SL::DB::Printer ->new(id => ($::form->{id} || ($::form->{printer} || {})->{id}))->load } -- 2.20.1