From 9002ae3946f434426a573cf20d23339e06ec2f93 Mon Sep 17 00:00:00 2001 From: Nicolas Legrand Date: Thu, 22 Oct 2020 12:01:55 +0200 Subject: [PATCH] Bug 26779: Make desk selection consistent in auth.tt and set-library.tt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When changing libraries in set-library.tt, the desks selection list prints only one desk. The desk list is printed with a different code from auth.pp but modified by the same javascript. Make the template code consistent and work for both pages. Test plan: 1. have at least two libraries with multiple desks and one without any desk. 2. go to set-library.pl, select the library without desks, you should see only a “---” entry. 3. select a library you're not logged in and you should see only one desk entry. 4. apply patch. 5. recheck 2. should still be ok. 6. recheck 3. this time you should see all desks. 7. check you can log and set desks as expected from auth.pp. --- koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc | 10 +--------- koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt | 5 +---- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc index 3538612..9201b1e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc @@ -11,15 +11,7 @@ [% BLOCK options_for_desks %] [% FOREACH d IN desks %] - [% IF d.branchcode == branch %] - [% IF selected == d.desk_id %] - - [% ELSE %] - - [% END %] - [% ELSE %] - - [% END%] + [% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt index ba3b266..773c552 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt @@ -88,10 +88,7 @@

[% END %] -- 2.1.4