From d79a19d3a0c32bd40279f138c3ca367042c290f9 Mon Sep 17 00:00:00 2001
From: Josef Moravec <josef.moravec@gmail.com>
Date: Mon, 3 Aug 2020 07:29:15 +0000
Subject: [PATCH] Bug 24201: (QA follow-up) Fix desks select box selected attribute

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 .../prog/en/includes/html_helpers.inc              |    4 ++++
 .../prog/en/modules/circ/set-library.tt            |    2 +-
 2 files changed, 5 insertions(+), 1 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 2d734cd..3538612 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc
@@ -12,7 +12,11 @@
     <option id="nodesk" value="">---</option>
     [% FOREACH d IN desks %]
         [% IF d.branchcode == branch %]
+          [% IF selected == d.desk_id %]
+            <option class="[% d.branchcode | html %]" value="[% d.desk_id | html %]" selected="selected">[% d.desk_name | html %]</option>
+          [% ELSE %]
             <option class="[% d.branchcode | html %]" value="[% d.desk_id | html %]" >[% d.desk_name | html %]</option>
+          [% END %]
         [% ELSE %]
             <option class="[% d.branchcode | html %]" value="[% d.desk_id | html %]" disabled hidden>[% d.desk_name | html %]</option>
         [% END%]
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 2d6242d..c511a0b 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
@@ -79,7 +79,7 @@ Updated:<ul>
     <ol>
         <li><label for="desk">Choose Desk:</label>
         <select name="desk_id" id="desk_id">
-            [% PROCESS options_for_desks desks => Desks.all( selected => desk_id ) %]
+            [% PROCESS options_for_desks desks => Desks.all(), selected => desk_id  %]
         </select></li>
     </ol>
 </fieldset>
-- 
1.7.2.5