Attachment 172813 Details for Bug 37891 – [24.05]Bug 37891: (QA follow-up): Fix tt_valid QA test

[patch] [24.05]Bug 37891: (QA follow-up): Fix tt_valid QA test

2405Bug-37891-QA-follow-up-Fix-ttvalid-QA-test.patch (text/plain), 7.80 KB, created by Pedro Amorim on 2024-10-16 12:03:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pedro Amorim

Created: 2024-10-16 12:03:54 UTC

Size: 7.80 KB

patch

obsolete

>From f475cebd27ab44fba5b885b2e415943768f4c38d Mon Sep 17 00:00:00 2001
>From: Pedro Amorim <pedro.amorim@ptfs-europe.com>
>Date: Mon, 30 Sep 2024 13:47:06 +0000
>Subject: [PATCH] [24.05]Bug 37891: (QA follow-up): Fix tt_valid QA test
>
>1) Apply both patches
>2) $ qa -c 2 -v 2
>
>Amended-by: Jonathan Druart
>Add the different attribute at the end of the node so that we can easily
>see what's different between the two lines
>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>---
> .../prog/en/modules/tools/letter.tt           | 36 +++++++++++++++----
> 1 file changed, 30 insertions(+), 6 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
>index b1c5b88cfb..2d371842ce 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
>@@ -630,14 +630,26 @@
>                             <li>
>                                 <label for="is_html_[% letter.message_transport_type | html %]_[% lang | html %]">HTML message:</label>
>                                 [% IF letter.is_html %]
>-                                    <input [% IF sms_readonly %] disabled="disabled" [% END %] type="checkbox" name="is_html_[% letter.message_transport_type | html %]_[% lang | html %]" id="is_html_[% letter.message_transport_type | html %]_[% lang | html %]" value="1" checked="checked" />
>+                                    [% IF sms_readonly %]
>+                                        <input type="checkbox" name="is_html_[% letter.message_transport_type | html %]_[% lang | html %]" id="is_html_[% letter.message_transport_type | html %]_[% lang | html %]" value="1" checked="checked" disabled="disabled" />
>+                                    [% ELSE %]
>+                                        <input type="checkbox" name="is_html_[% letter.message_transport_type | html %]_[% lang | html %]" id="is_html_[% letter.message_transport_type | html %]_[% lang | html %]" value="1" checked="checked" />
>+                                    [% END %]
>                                 [% ELSE %]
>-                                    <input [% IF sms_readonly %] disabled="disabled" [% END %] type="checkbox" name="is_html_[% letter.message_transport_type | html %]_[% lang | html %]" id="is_html_[% letter.message_transport_type | html %]_[% lang | html %]" value="1" />
>+                                    [% IF sms_readonly %]
>+                                        <input type="checkbox" name="is_html_[% letter.message_transport_type | html %]_[% lang | html %]" id="is_html_[% letter.message_transport_type | html %]_[% lang | html %]" value="1" disabled="disabled" />
>+                                    [% ELSE %]
>+                                        <input type="checkbox" name="is_html_[% letter.message_transport_type | html %]_[% lang | html %]" id="is_html_[% letter.message_transport_type | html %]_[% lang | html %]" value="1" />
>+                                    [% END %]
>                                 [% END %]
>                             </li>
>                             <li>
>                                 <label for="title_[% letter.message_transport_type | html %]_[% lang | html %]">Message subject:</label>
>-                                <input [% IF sms_readonly %] readonly [% END %] type="text" id="title_[% letter.message_transport_type | html %]_[% lang | html %]" name="title" size="60" value="[% letter.title | html %]" />
>+                                [% IF sms_readonly %]
>+                                    <input type="text" id="title_[% letter.message_transport_type | html %]_[% lang | html %]" name="title" size="60" value="[% letter.title | html %]" readonly />
>+                                [% ELSE %]
>+                                    <input type="text" id="title_[% letter.message_transport_type | html %]_[% lang | html %]" name="title" size="60" value="[% letter.title | html %]" />
>+                                [% END %]
>                             </li>
>                             <li>
>                                 <label for="SQLfieldname_[% letter.message_transport_type | html %]_[% lang | html %]">Message body:</label>
>@@ -655,17 +667,29 @@
>                                 <table>
>                                     <tr>
>                                         <td>
>-                                            <select [% IF sms_readonly %] disabled="disabled" [% END %] name="SQLfieldname" id="SQLfieldname_[% letter.message_transport_type | html %]_[% lang | html %]" multiple="multiple" size="9">
>+                                            [% IF sms_readonly %]
>+                                                <select name="SQLfieldname" id="SQLfieldname_[% letter.message_transport_type | html %]_[% lang | html %]" multiple="multiple" size="9" disabled="disabled" >
>+                                            [% ELSE%]
>+                                                <select name="SQLfieldname" id="SQLfieldname_[% letter.message_transport_type | html %]_[% lang | html %]" multiple="multiple" size="9">
>+                                            [% END %]
>                                                 [% FOREACH SQLfieldname IN SQLfieldnames %]
>                                                     <option value="[% SQLfieldname.value | html %]">[% SQLfieldname.text | html %]</option>
>                                                 [% END %]
>                                             </select>
>                                         </td>
>                                         <td class="actions">
>-                                            <button [% IF sms_readonly %] disabled="disabled" [% END %] type="button" data-containerid="[% letter.message_transport_type | html %]_[% lang | html %]" class="btn btn-default btn-sm insert">Insert <i class="fa-solid fa-right-long"></i></button>
>+                                            [% IF sms_readonly %]
>+                                                <button type="button" data-containerid="[% letter.message_transport_type | html %]_[% lang | html %]" class="btn btn-default btn-sm insert">Insert <i class="fa-solid fa-right-long" disabled="disabled"></i></button>
>+                                            [% ELSE %]
>+                                                <button type="button" data-containerid="[% letter.message_transport_type | html %]_[% lang | html %]" class="btn btn-default btn-sm insert">Insert <i class="fa-solid fa-right-long"></i></button>
>+                                            [% END %]
>                                         </td>
>                                         <td>
>-                                            <textarea [% IF sms_readonly %] readonly [% END %] name="content" data-lang="[% lang | html %]" class="content_[% letter.message_transport_type | html %]" id="content_[% letter.message_transport_type | html %]_[% lang | html %]" cols="80" rows="15">[% letter.content | html %]</textarea>
>+                                        [% IF sms_readonly %]
>+                                            <textarea name="content" data-lang="[% lang | html %]" class="content_[% letter.message_transport_type | html %]" id="content_[% letter.message_transport_type | html %]_[% lang | html %]" cols="80" rows="15" readonly>[% letter.content | html %]</textarea>
>+                                        [% ELSE %]
>+                                            <textarea name="content" data-lang="[% lang | html %]" class="content_[% letter.message_transport_type | html %]" id="content_[% letter.message_transport_type | html %]_[% lang | html %]" cols="80" rows="15">[% letter.content | html %]</textarea>
>+                                        [% END %]
>                                         </td>
>                                     </tr>
>                                 </table>
>-- 
>2.39.5

Actions: View | Diff | Splinter Review

Attachments on bug 37891: 171300 | 172037 | 172222 | 172224 | 172225 | 172812 | 172813 | 172818