From 276b04c413e1615201865b08c7c71c8005a54224 Mon Sep 17 00:00:00 2001 From: Lucas Gass Date: Tue, 5 Mar 2024 21:58:59 +0000 Subject: [PATCH] Bug 36237: UI improvments for set-library page To test: 1. Enable UseCirculationDesks, make some desks via UseCashRegisters > Circulation desks 2. Enable UseCashRegisters, make some registers via UseCashRegisters > Registers 3. Go to set library page. Try changing the branch, desk, or register. 4. See that UI could use some improvements. 5. APPLY patch 6. Try 3 again, making sure everything works right. --- circ/set-library.pl | 4 +- .../prog/en/modules/circ/set-library.tt | 75 ++++++++++--------- 2 files changed, 41 insertions(+), 38 deletions(-) diff --git a/circ/set-library.pl b/circ/set-library.pl index 7929a2701b..55961ed949 100755 --- a/circ/set-library.pl +++ b/circ/set-library.pl @@ -64,8 +64,8 @@ if ( $session->param('branch', $branch); # update sesssion in DB push @updated, { updated_branch => 1, - old_branch => $userenv_branch, - new_branch => $branch, + old_branch => Koha::Libraries->find( $userenv_branch )->branchname, + new_branch => Koha::Libraries->find( $branch )->branchname, }; } # else branch the same, no update if ( $desk_id && (!$userenv_desk or $userenv_desk ne $desk_id) ) { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt index 5834f2cfa5..cf00328196 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt @@ -52,42 +52,45 @@

Set library

[% IF ( updated ) %] - -

Update succeeded

-Updated: -
- [% INCLUDE 'csrf-token.inc' %] -
- [% FOREACH recycle_loo IN recycle_loop %] - [% SET param = recycle_loo.param %] - [% NEXT IF param == 'op' %] - [% NEXT IF param == 'csrf_token' %] - [% IF param == 'original_op' %][% param = 'op' %][% END %] - - [% IF param == 'op' %][% SET has_op = 1 %][% END %] - [% END %] - [% UNLESS has_op %] - [%# Trick to pass anti-CSRF requirements %] - [% END %] -
- -
+
+ Update succeeded + +
+
+ [% INCLUDE 'csrf-token.inc' %] +
+ [% FOREACH recycle_loo IN recycle_loop %] + [% SET param = recycle_loo.param %] + [% NEXT IF param == 'op' %] + [% NEXT IF param == 'csrf_token' %] + [% IF param == 'original_op' %][% param = 'op' %][% END %] + + [% IF param == 'op' %][% SET has_op = 1 %][% END %] + [% END %] + [% UNLESS has_op %] + [%# Trick to pass anti-CSRF requirements %] + [% END %] +
+
+ +
+
[% ELSE %] -- 2.30.2