From ccc7b3c8947c190b511ce5535382e50793f24c26 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Tue, 28 Jul 2020 13:17:54 +0000
Subject: [PATCH] Bug 21946: (follow-up) Add optgroup label in circ rules

This patch adds a label to the optgroup showing child itemtypes in the
circulation and fine rules interface.

The parent itemtype description is the optgroup label, and then the
parent itemtype is repeated as an <option> with the additional label
"All"

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 .../prog/en/modules/admin/smart-rules.tt      | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
index a36daf5f4a..b34d02e2fa 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
@@ -342,18 +342,20 @@
                     <td>
                         <select name="itemtype" id="matrixitemtype" style="width:13em;">
                             <option value="*">All</option>
-                        [% FOREACH itemtypeloo IN itemtypeloop %]
-                            [% NEXT IF itemtypeloo.parent_type %]
-                            <option value="[% itemtypeloo.itemtype | html %]">[% itemtypeloo.translated_description | html %]</option>
-                            [% SET children = itemtypeloo.children_with_localization %]
-                            [% IF children %]
-                                <optgroup>
-                                [% FOREACH child IN children %]
-                                    <option value="[% child.itemtype | html %]">[% child.translated_description | html %]</option>
+                            [% FOREACH itemtypeloo IN itemtypeloop %]
+                                [% NEXT IF itemtypeloo.parent_type %]
+                                [% SET children = itemtypeloo.children_with_localization %]
+                                [% IF children %]
+                                    <optgroup label="[% itemtypeloo.translated_description | html %]">
+                                        <option value="[% itemtypeloo.itemtype | html %]">[% itemtypeloo.translated_description | html %] (All)</option>
+                                        [% FOREACH child IN children %]
+                                            <option value="[% child.itemtype | html %]">[% child.translated_description | html %]</option>
+                                        [% END %]
+                                    </optgroup>
+                                [% ELSE %]
+                                    <option value="[% itemtypeloo.itemtype | html %]">[% itemtypeloo.translated_description | html %]</option>
                                 [% END %]
-                                </optgroup>
                             [% END %]
-                        [% END %]
                         </select>
                     </td>
                     <td class="actions">
-- 
2.39.2