Attachment 93033 Details for Bug 23321 – Bug 23321: (QA follow-up) Add missing TT filters

[patch] Bug 23321: (QA follow-up) Add missing TT filters

Bug-23321-QA-follow-up-Add-missing-TT-filters.patch (text/plain), 7.55 KB, created by Tomás Cohen Arazi (tcohen) on 2019-09-20 19:03:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomás Cohen Arazi (tcohen)

Created: 2019-09-20 19:03:03 UTC

Size: 7.55 KB

patch

obsolete

>From 9b6d1cd636bd56542288088b018a34fb2029c72a Mon Sep 17 00:00:00 2001
>From: Tomas Cohen Arazi <tomascohen@theke.io>
>Date: Fri, 20 Sep 2019 15:30:29 -0300
>Subject: [PATCH] Bug 23321: (QA follow-up) Add missing TT filters
>
>Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
>---
> .../prog/en/modules/admin/cash_registers.tt   | 26 +++++++++----------
> .../prog/en/modules/members/paycollect.tt     |  8 +++---
> 2 files changed, 17 insertions(+), 17 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt
>index 35e6d63d24..ea5ff903c9 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt
>@@ -68,7 +68,7 @@
>                         [% IF cash_register %]
>                             <li>
>                                 <span class="label">Cash Register ID: </span>[% cash_register.id | html %]
>-                                <input type="hidden" name="id" value="[% cash_register.id %]" />
>+                                <input type="hidden" name="id" value="[% cash_register.id | html %]" />
>                             </li>
>                         [% END %]
> 
>@@ -80,16 +80,16 @@
> 
>                             <li>
>                                 <label for="description">Description: </label>
>-                                <input type="text" name="description" id="description" value="[% cash_register.description %]"/>
>+                                <input type="text" name="description" id="description" value="[% cash_register.description | html %]"/>
>                             </li>
>                             <li>
>                                 <label for="branch">Library: </label>
>                                 <select id="branch" name="branch">
>                                 [% FOREACH branch IN branch_list %]
>                                 [% IF cash_register.branch == branch.branchcode %]
>-                                    <option value="[% branch.branchcode %]" selected="1">[% branch.branchname %]</option>
>+                                    <option value="[% branch.branchcode | html %]" selected="1">[% branch.branchname | html %]</option>
>                                 [% ELSE %]
>-                                    <option value="[% branch.branchcode %]">[% branch.branchname %]</option>
>+                                    <option value="[% branch.branchcode | html %]">[% branch.branchname | html %]</option>
>                                 [% END %]
>                                 [% END %]
>                                 </select>
>@@ -97,7 +97,7 @@
> 
>                             <li>
>                                 <label for="starting_float">Initial float: </label>
>-                                <input type="text" pattern='^\d+(?:\.\d{0,2})$' name="starting_float" id="starting_float" value="[% cash_register.starting_float %]" />
>+                                <input type="text" pattern='^\d+(?:\.\d{0,2})$' name="starting_float" id="starting_float" value="[% cash_register.starting_float | html %]" />
>                             </li>
>                         </ol>
>                    </fieldset>
>@@ -141,23 +141,23 @@
>                    [% ELSE %]
>                    <tr>
>                    [% END %]
>-                       <td>[% cash_register.name %]</td>
>-                       <td>[% cash_register.description %]</td>
>-                       <td>[% cash_register.library.branchname %]</td>
>+                       <td>[% cash_register.name | html %]</td>
>+                       <td>[% cash_register.description | html %]</td>
>+                       <td>[% cash_register.library.branchname | html %]</td>
>                        <td>[% IF cash_register.branch_default %]Yes[% ELSE %]No[% END %]</td>
>-                       <td>[% cash_register.starting_float %]</td>
>+                       <td>[% cash_register.starting_float | html %]</td>
>                        [% IF cash_register.archived == '0' %]
>                        <td class="actions">
>                            <a class="btn btn-default btn-xs" href="cash_registers.pl?op=add_form&amp;id=[% cash_register.id | uri %]"><i class="fa fa-pencil"></i> Edit</a>
>                            [% IF cash_register.branch_default %]
>-                           <a class="btn btn-default btn-xs" href="cash_registers.pl?op=drop_default&amp;id=[% cash_register.id %]"><i class="fa fa-archive"></i> Drop default</a>
>+                           <a class="btn btn-default btn-xs" href="cash_registers.pl?op=drop_default&amp;id=[% cash_register.id | uri %]"><i class="fa fa-archive"></i> Drop default</a>
>                            [% ELSE %]
>-                           <a class="btn btn-default btn-xs" href="cash_registers.pl?op=make_default&amp;id=[% cash_register.id %]"><i class="fa fa-archive"></i> Make default</a>
>+                           <a class="btn btn-default btn-xs" href="cash_registers.pl?op=make_default&amp;id=[% cash_register.id | uri %]"><i class="fa fa-archive"></i> Make default</a>
>                            [% END %]
>-                           <a class="btn btn-default btn-xs" href="cash_registers.pl?op=archive&amp;id=[% cash_register.id %]"><i class="fa fa-archive"></i> Archive</a>
>+                           <a class="btn btn-default btn-xs" href="cash_registers.pl?op=archive&amp;id=[% cash_register.id | uri %]"><i class="fa fa-archive"></i> Archive</a>
>                        </td>
>                        [% ELSE %]
>-                       <td class="actions"><a class="btn btn-default btn-xs" href="cash_registers.pl?op=unarchive&amp;id=[% cash_register.id %]"><i class="fa fa-trash-restore"></i> Restore</a></td>
>+                       <td class="actions"><a class="btn btn-default btn-xs" href="cash_registers.pl?op=unarchive&amp;id=[% cash_register.id | uri %]"><i class="fa fa-trash-restore"></i> Restore</a></td>
>                        [% END %]
>                    </tr>
>                    [% 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 2f71eb842f..dfd4935571 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
>@@ -134,9 +134,9 @@
>         <select name="cash_register" id="cash_register">
>             [% FOREACH register IN registers %]
>               [% IF register.id == registerid %]
>-            <option value="[% register.id %]" selected="selected">[% register.name | html %]</option>
>+            <option value="[% register.id | html %]" selected="selected">[% register.name | html %]</option>
>               [% ELSE %]
>-            <option value="[% register.id %]">[% register.name | html %]</option>
>+            <option value="[% register.id | html %]">[% register.name | html %]</option>
>               [% END %]
>             [% END %]
>         </select>
>@@ -263,9 +263,9 @@
>         <select name="cash_register" id="cash_register">
>             [% FOREACH register IN registers %]
>               [% IF register.id == registerid %]
>-            <option value="[% register.id %]" selected="selected">[% register.name | html %]</option>
>+            <option value="[% register.id | html %]" selected="selected">[% register.name | html %]</option>
>               [% ELSE %]
>-            <option value="[% register.id %]">[% register.name | html %]</option>
>+            <option value="[% register.id | html %]">[% register.name | html %]</option>
>               [% END %]
>             [% END %]
>         </select>
>-- 
>2.23.0

Actions: View | Diff | Splinter Review

Attachments on bug 23321: 91596 | 91597 | 91598 | 91599 | 91600 | 91601 | 91602 | 91621 | 92057 | 92058 | 92059 | 92060 | 92061 | 92062 | 92063 | 92064 | 92065 | 92083 | 92084 | 92085 | 92086 | 92087 | 92088 | 92089 | 92090 | 92091 | 92394 | 92395 | 92396 | 92397 | 92398 | 92399 | 92400 | 92401 | 92402 | 92467 | 92468 | 92469 | 92470 | 92471 | 92472 | 92473 | 92474 | 92475 | 92803 | 92804 | 92805 | 92806 | 92807 | 92808 | 92809 | 92810 | 92811 | 92812 | 92813 | 92814 | 92829 | 92879 | 92880 | 92881 | 92882 | 92883 | 92884 | 92885 | 92886 | 92887 | 92888 | 92889 | 93019 | 93020 | 93021 | 93022 | 93023 | 93024 | 93025 | 93026 | 93027 | 93028 | 93029 | 93030 | 93031 | 93032 | 93033 | 93034 | 93035 | 93188