Attachment 63207 Details for Bug 17762 – Bug 17762: Fix sql fields insertion

[patch] Bug 17762: Fix sql fields insertion

Bug-17762-Fix-sql-fields-insertion.patch (text/plain), 3.38 KB, created by Nick Clemens (kidclamp) on 2017-05-05 20:22:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nick Clemens (kidclamp)

Created: 2017-05-05 20:22:03 UTC

Size: 3.38 KB

patch

obsolete

>From 31c78731ae0898d57284015cbcff19b7b138bebb Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Thu, 29 Dec 2016 10:31:38 +0000
>Subject: [PATCH] Bug 17762: Fix sql fields insertion
>
>The "Insert ->" buttons used to copy the sql field to the textarea was
>based on the id of the fieldset.
>This id has to be unique to work as expected. It is now composed of mtt
>+ lang instead of mtt only
>
>Signed-off-by: Hugo Agud <hagud@orex.es>
>
>Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
>---
> koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt | 12 ++++++------
> 1 file changed, 6 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 08c6076..441b0ed 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
>@@ -138,8 +138,8 @@ $(document).ready(function() {
> 		}
> 		return true;
> 		}
>-        function insertValueQuery(mtt_id) {
>-            var fieldset = $("#" + mtt_id);
>+        function insertValueQuery(containerid) {
>+            var fieldset = $("#" + containerid);
>             var myQuery = $(fieldset).find('textarea[name="content"]');
>             var myListBox = $(fieldset).find('select[name="SQLfieldname"]');
> 
>@@ -415,13 +415,13 @@ $(document).ready(function() {
>                 [% END %]
>             </h3>
>             [% IF letter.message_transport_type == "sms" and not Koha.Preference("SMSSendDriver") %]
>-              <fieldset class="rows mtt" id="[% letter.message_transport_type %]" disabled="disabled">
>+              <fieldset class="rows mtt" id="[% letter.message_transport_type %]_[% lang %]" disabled="disabled">
>                 <div class="dialog message">You should enable the SMSSendDriver preference to use the SMS templates.</div>
>             [% ELSIF letter.message_transport_type == "phone" and not Koha.Preference("TalkingTechItivaPhoneNotification") %]
>-              <fieldset class="rows mtt" id="[% letter.message_transport_type %]" disabled="disabled">
>+              <fieldset class="rows mtt" id="[% letter.message_transport_type %]_[% lang %]" disabled="disabled">
>                 <div class="dialog message">You should enable the TalkingTechItivaPhoneNotification preference to use the phone templates.</div>
>             [% ELSE %]
>-              <fieldset class="rows mtt" id="[% letter.message_transport_type %]">
>+              <fieldset class="rows mtt" id="[% letter.message_transport_type %]_[% lang %]">
>             [% END %]
>               <ol>
>                 <li>
>@@ -452,7 +452,7 @@ $(document).ready(function() {
>                         </select>
>                       </td>
>                         <td class="actions">
>-                            <button type="button" data-containerid="[% letter.message_transport_type %]" class="btn btn-default btn-sm insert">Insert <i class="fa fa-long-arrow-right"></i></button>
>+                            <button type="button" data-containerid="[% letter.message_transport_type %]_[% lang %]" class="btn btn-default btn-sm insert">Insert <i class="fa fa-long-arrow-right"></i></button>
>                         </td>
>                       <td><textarea name="content" id="content_[% letter.message_transport_type %]" cols="80" rows="15">[% letter.content %]</textarea></td>
>                     </tr>
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 17762: 58133 | 58134 | 58135 | 58136 | 58137 | 58138 | 58139 | 58140 | 58141 | 58525 | 59452 | 59453 | 59454 | 59455 | 59456 | 59457 | 59458 | 59459 | 59460 | 59461 | 61614 | 61615 | 61616 | 61617 | 61618 | 61619 | 61620 | 61621 | 61622 | 61623 | 61624 | 63199 | 63200 | 63201 | 63202 | 63203 | 63204 | 63205 | 63206 | 63207 | 63208 | 63209 | 63210 | 63211