Attachment 151820 Details for Bug 25079 – Bug 25079: (QA follow-up) Fix TT issues

[patch] Bug 25079: (QA follow-up) Fix TT issues

Bug-25079-QA-follow-up-Fix-TT-issues.patch (text/plain), 4.85 KB, created by Kyle M Hall (khall) on 2023-05-30 18:14:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2023-05-30 18:14:59 UTC

Size: 4.85 KB

patch

obsolete

>From 385a4778ec38ce44933f89d110e51e5c9b9c6c18 Mon Sep 17 00:00:00 2001
>From: Kyle M Hall <kyle@bywatersolutions.com>
>Date: Tue, 30 May 2023 13:42:16 -0400
>Subject: [PATCH] Bug 25079: (QA follow-up) Fix TT issues
>
>Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
>---
> .../prog/en/modules/clubs/club-enrollments.tt  |  2 +-
> .../prog/en/modules/clubs/patron-clubs-tab.tt  |  2 +-
> .../prog/en/modules/clubs/patron-enroll.tt     | 18 +++++++++++-------
> 3 files changed, 13 insertions(+), 9 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt
>index cfee5d7669..8bd3e534da 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt
>@@ -46,7 +46,7 @@
>                                 <th>Name</th>
>                                 <th>Card number</th>
>                                 [% FOREACH club_template_enrollment_field IN club.club_template.club_template_enrollment_fields %]
>-                                    <th>[% club_template_enrollment_field.name %] </th>
>+                                    <th>[% club_template_enrollment_field.name | html %] </th>
>                                 [% END %]
>                             </tr>
>                         </thead>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-clubs-tab.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-clubs-tab.tt
>index 325f2bfa38..df65eccf21 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-clubs-tab.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-clubs-tab.tt
>@@ -21,7 +21,7 @@
>                     <td>[% e.date_enrolled | $KohaDates %]</td>
>                     [% IF CAN_user_clubs_enroll %]
>                         <td>
>-                            <button class="btn btn-xs btn-default" onclick="loadEnrollmentForm([% e.club.id %],[% e.id %])">
>+                            <button class="btn btn-xs btn-default" onclick="loadEnrollmentForm([% e.club.id | html %],[% e.id | html %])">
>                                 <i class="fa fa-edit"></i>Modify enrollment
>                             </button>
>                             <button class="btn btn-xs btn-default" onclick="cancelEnrollment( [% e.id | html %] )">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-enroll.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-enroll.tt
>index 1c4e858ba7..76cb6702b6 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-enroll.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-enroll.tt
>@@ -16,17 +16,21 @@
>                     [% FOREACH c IN club_enrollment_fields %]
>                         [% IF f.id == c.club_template_enrollment_field_id %]
>                             <li>
>-                                <label>[% f.name %]</label>
>+                                <label>[% f.name | html %]</label>
>                                 [% IF f.authorised_value_category %]
>-                                    <select name="[% f.id %]">
>+                                    <select name="[% f.id | html %]">
>                                         [% FOREACH a IN AuthorisedValues.Get( f.authorised_value_category ) %]
>-                                        <option value="[% a.authorised_value %]" [% IF a.authorised_value == c.value %]selected="selected"[% END %]>[% a.lib %]</option>
>+                                            [% IF a.authorised_value == c.value %]
>+                                                <option value="[% a.authorised_value | html %]" selected="selected">[% a.lib | html %]</option>
>+                                            [% ELSE %]
>+                                                <option value="[% a.authorised_value | html %]">[% a.lib | html %]</option>
>+                                            [% END %]
>                                         [% END %]
>                                     </select>
>                                 [% ELSE %]
>-                                    <input type="text" name="[% f.id %]" value="[% c.value %]"/>
>+                                    <input type="text" name="[% f.id | html %]" value="[% c.value | html %]"/>
>                                 [% END %]
>-                                <span class="hint">[% f.description %]</span>
>+                                <span class="hint">[% f.description | html %]</span>
>                             </li>
>                         [% END %]
>                     [% END %]
>@@ -58,8 +62,8 @@
> </div>
> 
> <script>
>-if([% enrollent_id %]){
>-    $("#heading").html(_("Modifying enrollment")+" <em>[% club.name %]</em>");
>+if([% enrollent_id | html %]){
>+    $("#heading").html(_("Modifying enrollment")+" <em>[% club.name | html %]</em>");
> }
> function addEnrollment() {
>     $("body").css("cursor", "progress");
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 25079: 149544 | 149545 | 151603 | 151604 | 151818 | 151819 | 151820 | 152496 | 152497 | 152498