Lines 51-105
my @updated;
Link Here
|
51 |
|
51 |
|
52 |
my $library = Koha::Libraries->find($branch); |
52 |
my $library = Koha::Libraries->find($branch); |
53 |
# $session lines here are doing the updating |
53 |
# $session lines here are doing the updating |
|
|
54 |
## Please see file perltidy.ERR |
54 |
if ( |
55 |
if ( |
55 |
$op eq 'cud-set-library' |
56 |
$op eq 'cud-set-library' |
56 |
&& $library |
57 |
&& $library |
57 |
&& ( C4::Auth::haspermission( C4::Context->userenv->{'id'}, { 'loggedinlibrary' => 1 } ) |
58 |
&& ( C4::Auth::haspermission( C4::Context->userenv->{'id'}, { 'loggedinlibrary' => 1 } ) |
58 |
or C4::Context::IsSuperLibraian() ) |
59 |
or C4::Context::IsSuperLibrarian() ) |
59 |
) |
60 |
) |
60 |
{ |
61 |
{ |
61 |
if ( !$userenv_branch or $userenv_branch ne $branch ) { |
62 |
if ( !$userenv_branch or $userenv_branch ne $branch ) { |
62 |
my $branchname = $library->branchname; |
63 |
my $branchname = $library->branchname; |
63 |
$session->param('branchname', $branchname); # update sesssion in DB |
64 |
$session->param( 'branchname', $branchname ); # update sesssion in DB |
64 |
$session->param('branch', $branch); # update sesssion in DB |
65 |
$session->param( 'branch', $branch ); # update sesssion in DB |
65 |
push @updated, { |
66 |
push @updated, { |
66 |
updated_branch => 1, |
67 |
updated_branch => 1, |
67 |
old_branch => $userenv_branch, |
68 |
old_branch => $userenv_branch, |
68 |
new_branch => $branch, |
69 |
new_branch => $branch, |
69 |
}; |
70 |
}; |
70 |
} # else branch the same, no update |
71 |
} # else branch the same, no update |
71 |
if ( $desk_id && (!$userenv_desk or $userenv_desk ne $desk_id) ) { |
72 |
} elsif ( $op eq 'cud-set-library' && $library ) { |
72 |
my $desk = Koha::Desks->find( { desk_id => $desk_id } ); |
73 |
if ( $desk_id && ( !$userenv_desk or $userenv_desk ne $desk_id ) ) { |
|
|
74 |
my $desk = Koha::Desks->find( { desk_id => $desk_id } ); |
73 |
my $old_desk_name = ''; |
75 |
my $old_desk_name = ''; |
74 |
if ($userenv_desk) { |
76 |
if ($userenv_desk) { |
75 |
$old_desk_name = Koha::Desks->find( { desk_id => $userenv_desk })->desk_name; |
77 |
$old_desk_name = Koha::Desks->find( { desk_id => $userenv_desk } )->desk_name; |
76 |
} |
78 |
} |
77 |
$template->param( LoginDeskname => $desk->desk_name ); |
79 |
$template->param( LoginDeskname => $desk->desk_name ); |
78 |
$template->param( LoginDeskid => $desk->desk_id ); |
80 |
$template->param( LoginDeskid => $desk->desk_id ); |
79 |
$session->param( desk_name => $desk->desk_name ); |
81 |
$session->param( desk_name => $desk->desk_name ); |
80 |
$session->param( desk_id => $desk->desk_id ); |
82 |
$session->param( desk_id => $desk->desk_id ); |
81 |
$session->flush(); |
83 |
$session->flush(); |
82 |
push @updated, { |
84 |
push @updated, { |
83 |
updated_desk => 1, |
85 |
updated_desk => 1, |
84 |
old_desk => $old_desk_name, |
86 |
old_desk => $old_desk_name, |
85 |
}; |
87 |
}; |
86 |
} |
88 |
} |
87 |
if ( defined($register_id) |
89 |
if ( defined($register_id) |
88 |
&& ( $userenv_register_id ne $register_id ) ) |
90 |
&& ( $userenv_register_id ne $register_id ) ) |
89 |
{ |
91 |
{ |
90 |
my $old_register_name = C4::Context->userenv->{'register_name'} || ''; |
92 |
my $old_register_name = C4::Context->userenv->{'register_name'} || ''; |
91 |
my $register = Koha::Cash::Registers->find($register_id); |
93 |
my $register = Koha::Cash::Registers->find($register_id); |
92 |
$session->param( 'register_id', $register_id ); |
94 |
$session->param( 'register_id', $register_id ); |
93 |
$session->param( 'register_name', $register ? $register->name : '' ); |
95 |
$session->param( 'register_name', $register ? $register->name : '' ); |
94 |
push @updated, |
96 |
push @updated, |
95 |
{ |
97 |
{ |
96 |
updated_register => 1, |
98 |
updated_register => 1, |
97 |
old_register => $old_register_name |
99 |
old_register => $old_register_name |
98 |
}; |
100 |
}; |
99 |
} |
101 |
} |
100 |
$session->flush(); |
102 |
$session->flush(); |
101 |
} else { |
103 |
} else { |
102 |
$branch = $userenv_branch; # fallback value |
104 |
$branch = $userenv_branch; # fallback value |
103 |
$desk_id = $userenv_desk; |
105 |
$desk_id = $userenv_desk; |
104 |
} |
106 |
} |
105 |
|
107 |
|
106 |
- |
|
|