From 9308e3d5190a496e1c1bd603de3a8b2a8392d1df Mon Sep 17 00:00:00 2001
From: Lucas Gass <lucas@bywatersolutions.com>
Date: Fri, 12 Jan 2024 17:35:24 +0000
Subject: [PATCH] Bug 34234: Respect display_order in additem.tt and detail.tt

1. APPLY PATCH
2. EnableItemGroups
3. Find a record and add some new item groups with display orders that are different from the order in which the groups were added
4. Check the checkbox next to one or more items and click the link to "Add/move to item group"
5. Ensure display order is correct
6. Now add a new item to the record and scroll down to the dropdown underneath "+ Add to item group"
7. Display order should be correct.

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Victor Grousset/tuxayo <victor@tuxayo.net>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit bcfc786f17fad8b7c866ee6063d2953d7b5d925d)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
---
 koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt    | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
index fc6cf65b1d..d7848f7617 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
@@ -1246,7 +1246,7 @@
                         <p>
                             <label for="item_group" class="required">Item group: </label>
                             <select name="item_group" id="item-group-add-form-select">
-                                [% FOREACH ig IN biblio.item_groups %]
+                                [% FOREACH ig IN biblio.item_groups.search({}, {order_by => 'display_order'}) %]
                                     <option value="[% ig.id | html %]">[% ig.description | html %]</option>
                                 [% END %]
                             </select>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
index f1eb5ebc8b..97b9dcb65a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
@@ -260,7 +260,7 @@
             <label for="select_item_group">Options: </label>
             <select name="item_group" id="item-group-add-or-create-form-select">
                 <optgroup label="Use existing item group">
-                    [% FOREACH ig IN item_groups %]
+                    [% FOREACH ig IN biblio.item_groups.search({}, {order_by => 'display_order'}) %]
                         <option value="[% ig.id | html %]">[% ig.description | html %]</option>
                     [% END %]
                 </optgroup>
-- 
2.39.5