From ef4efffe46584e9cb9e8333d226e267992acb8cd Mon Sep 17 00:00:00 2001
From: Pedro Amorim <pedro.amorim@ptfs-europe.com>
Date: Fri, 5 Jul 2024 15:38:26 +0000
Subject: [PATCH] Bug 37246: (QA follow-up) DRY Dropdown

If we're using the same dropdown it should be defined once.

Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
---
 .../prog/en/modules/suggestion/suggestion.tt  | 63 +++++++++----------
 1 file changed, 29 insertions(+), 34 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
index 481d9ae046..048990113a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
@@ -591,21 +591,7 @@
                             </select>
                         </li>
                         <li>
-                            <label for="budgetid">Fund:</label>
-                            <select name="budgetid" id="budgetid">
-                                <option value="">Any</option>
-                                [% FOREACH budget IN sugg_budgets %]
-                                    [% IF ( budget.selected ) %]
-                                        <option value="[% budget.b_id | html %]" selected="selected">[% budget.b_txt | html %] [% IF ( !budget.b_active ) %](inactive)[% END %]</option>
-                                    [% ELSIF ( budget.b_active ) %]
-                                        <option value="[% budget.b_id | html %]">[% budget.b_txt | html %]</option>
-                                    [% ELSE %]
-                                        <option value="[% budget.b_id | html %]" class="b_inactive">[% budget.b_txt | html %] (inactive)</option>
-                                    [% END %]
-                                [% END %]
-                            </select>
-                            <label for="showallfunds" style="float:none;width:auto;">&nbsp;Show inactive:</label>
-                            <input type="checkbox" class="showallfunds" />
+                            [% PROCESS funds_dropdown %]
                         </li>
                         <li>
                             <label for="quantity">Copies:</label>
@@ -1219,25 +1205,7 @@
                                     <fieldset class="brief acquisition_information">
                                         <ol>
                                             <li>
-                                                <label for="budgetid">Fund:</label>
-                                                <select name="budgetid" id="budgetid">
-                                                    [% IF budgetid == '__NONE__' %]
-                                                        <option value="__NONE__" selected="selected">None</option>
-                                                    [% ELSE %]
-                                                        <option value="__NONE__">None</option>
-                                                    [% END %]
-                                                    [% FOREACH budget IN sugg_budgets %]
-                                                        [% IF ( budget.selected ) %]
-                                                            <option value="[% budget.b_id | html %]" selected="selected">[% budget.b_txt | html %] [% IF ( !budget.b_active ) %](inactive)[% END %]</option>
-                                                        [% ELSIF ( budget.b_active ) %]
-                                                            <option value="[% budget.b_id | html %]">[% budget.b_txt | html %]</option>
-                                                        [% ELSE %]
-                                                            <option value="[% budget.b_id | html %]" class="b_inactive">[% budget.b_txt | html %] (inactive)</option>
-                                                        [% END %]
-                                                    [% END %]
-                                                </select>
-                                                <label for="showallfunds" style="float:none;width:auto;">&nbsp;Show inactive:</label>
-                                                <input type="checkbox" class="showallfunds" />
+                                                [% PROCESS funds_dropdown %]
                                             </li>
                                         </ol>
                                     </fieldset> <!-- /#acquisition_information -->
@@ -1271,6 +1239,33 @@
 
     [% END # /IF op == "show" %]
 
+[% BLOCK funds_dropdown %]
+    <label for="budgetid">Fund:</label>
+    <select name="budgetid" id="budgetid">
+        [% IF op == 'save' %]
+            <option value="">Any</option>
+        [% ELSE %]
+            [% IF budgetid == '__NONE__' %]
+                <option value="__NONE__" selected="selected">None</option>
+            [% ELSE %]
+                <option value="__NONE__">None</option>
+            [% END %]
+        [% END %]
+        [% FOREACH budget IN sugg_budgets %]
+            [% IF ( budget.selected ) %]
+                <option value="[% budget.b_id | html %]" selected="selected">[% budget.b_txt | html %] [% IF ( !budget.b_active ) %](inactive)[% END %]</option>
+            [% ELSIF ( budget.b_active ) %]
+                <option value="[% budget.b_id | html %]">[% budget.b_txt | html %]</option>
+            [% ELSE %]
+                <option value="[% budget.b_id | html %]" class="b_inactive">[% budget.b_txt | html %] (inactive)</option>
+            [% END %]
+        [% END %]
+    </select>
+    <!-- this is needed -->
+    <label for="showallfunds" style="float:none;width:auto;">&nbsp;Show inactive:</label>
+    <input type="checkbox" class="showallfunds" />
+[% END %]
+
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'calendar.inc' %]
 
-- 
2.39.5