Attachment 113248 Details for Bug 24665 – Bug 24665: (QA follow-up) Fix selection default

[patch] Bug 24665: (QA follow-up) Fix selection default

Bug-24665-QA-follow-up-Fix-selection-default.patch (text/plain), 7.76 KB, created by Martin Renvoize (ashimema) on 2020-11-06 12:53:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2020-11-06 12:53:26 UTC

Size: 7.76 KB

patch

obsolete

>From d3cbda600540b7dfa6633ce891129614561be566 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Fri, 6 Nov 2020 12:48:28 +0000
>Subject: [PATCH] Bug 24665: (QA follow-up) Fix selection default
>
>This patch updates the html_helper for the cash register selection block
>to remove the 'empty option' such that it can be correclty set for each
>select case and updates all existing cases where we used the process
>block previously to include the relevant blank option '-- Select an
>option --', '-- None --', 'Library default' and finally the new '-- All
>--' options introduced with this bug.
>---
> koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc   | 5 -----
> koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt             | 4 +---
> koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt | 1 +
> .../intranet-tmpl/prog/en/modules/members/boraccount.tt     | 6 ++++--
> .../intranet-tmpl/prog/en/modules/members/paycollect.tt     | 6 ++++--
> koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt          | 3 ++-
> .../prog/en/modules/reports/cash_register_stats.tt          | 1 +
> 7 files changed, 13 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 123aff9ce1..86eab2547f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc
>@@ -24,11 +24,6 @@
> [% END %]
> 
> [% BLOCK options_for_registers %]
>-    [% IF register_required %]
>-    <option id="noregister" disabled selected="selected" value="">-- Select an option--</option>
>-    [% ELSE %]
>-    <option id="noregister" selected="selected" value="">-- None --</option>
>-    [% END %]
>     [% FOREACH r IN registers %]
>         [% IF r.branch == Branches.GetLoggedInBranchcode %]
>             [% IF r.selected %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
>index 9d63b7230b..b980f1e3af 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
>@@ -102,9 +102,7 @@
>         <label for="register_id">Cash register:</label>
>         <select name="register_id" id="register_id" class="input" tabindex="4">
>             <option id="noregister" value="" selected="selected">Library default</option>
>-            [% FOREACH r IN Registers.all() %]
>-            <option class="[%- r.branch | html -%][%- IF r.branch_default -%] default[%- END -%]" value="[% r.id | html %]" disabled style="display: none">[% r.name | html %]</option>
>-            [% END %]
>+            [% PROCESS options_for_registers registers => Registers.all() %]
>         </select>
>     </p>
>     [% 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 be0003b93d..c61493439f 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
>@@ -106,6 +106,7 @@ Updated:<ul>
>         <li>
>             <label for="register_id">Choose cash register:</label>
>             <select name="register_id" id="register_id">
>+                <option id="noregister" selected="selected" value="">-- None --</option>
>                 [% PROCESS options_for_registers registers => Registers.all() %]
>             </select>
>         </li>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
>index 2cdf76d508..efd430fd7c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
>@@ -185,7 +185,8 @@
>                                 <li>
>                                     <label for="registerid">Cash register: </label>
>                                     <select name="registerid" id="payout_registerid">
>-                                        [% PROCESS options_for_registers register_required => 1 %]
>+                                        <option id="noregister" disabled selected="selected" value="">-- Select an option--</option>
>+                                        [% PROCESS options_for_registers %]
>                                     </select>
>                                 </li>
>                                 [% END %]
>@@ -251,7 +252,8 @@
>                                 <li>
>                                     <label for="registerid">Cash register: </label>
>                                     <select name="registerid" id="refund_registerid">
>-                                        [% PROCESS options_for_registers register_required => 1 %]
>+                                        <option id="noregister" disabled selected="selected" value="">-- Select an option--</option>
>+                                        [% PROCESS options_for_registers %]
>                                     </select>
>                                 </li>
>                                 [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
>index 31d6a0151e..2d4a22d644 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
>@@ -155,7 +155,8 @@
>     <li>
>         <label for="cash_register">Cash register: </label>
>         <select name="cash_register" id="cash_register">
>-            [% PROCESS options_for_registers register_required => 1 %]
>+            <option id="noregister" disabled selected="selected" value="">-- Select an option--</option>
>+            [% PROCESS options_for_registers %]
>         </select>
>     </li>
>     [% END %]
>@@ -285,7 +286,8 @@
>     <li>
>         <label for="cash_register">Cash register: </label>
>         <select name="cash_register" id="cash_register">
>-            [% PROCESS options_for_registers register_required => 1 %]
>+            <option id="noregister" disabled selected="selected" value="">-- Select an option--</option>
>+            [% PROCESS options_for_registers %]
>         </select>
>     </li>
>     [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt
>index 9a52d2a537..d57f97637f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt
>@@ -129,7 +129,8 @@
>                             <li>
>                                 <label for="registerid">Cash register: </label>
>                                 <select name="registerid" id="registerid">
>-                                    [% PROCESS options_for_registers register_required => 1 %]
>+                                    <option id="noregister" disabled selected="selected" value="">-- Select an option--</option>
>+                                    [% PROCESS options_for_registers %]
>                                 </select>
>                             </li>
>                         </ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt
>index bc0dd7e9b9..fa6c521503 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt
>@@ -104,6 +104,7 @@
>                 <li>
>                     <label for="registerid">Cash register: </label>
>                     <select name="registerid" id="registerid">
>+                        <option id="noregister" selected="selected" value="">-- All --</option>
>                         [% PROCESS options_for_registers registers => Registers.all( selected => registerid ) %]
>                     </select>
>                 </li>
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 24665: 107150 | 107164 | 112901 | 112960 | 113247 | 113248 | 113261