Bugzilla – Attachment 5207 Details for
Bug 6704
merging records cuts off fields at quotation marks
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[SIGNED-OFF] Bug 6704 : Escaping html in the merging records, so " don't break the merge
SIGNED-OFF-Bug-6704--Escaping-html-in-the-merging-.patch (text/plain), 3.88 KB, created by
Nicole C. Engard
on 2011-08-29 10:56:24 UTC
(
hide
)
Description:
[SIGNED-OFF] Bug 6704 : Escaping html in the merging records, so " don't break the merge
Filename:
MIME Type:
Creator:
Nicole C. Engard
Created:
2011-08-29 10:56:24 UTC
Size:
3.88 KB
patch
obsolete
>From ed09239ee5860e4bf3d4893fb46154e14c5d1b83 Mon Sep 17 00:00:00 2001 >From: Chris Cormack <chrisc@catalyst.net.nz> >Date: Mon, 29 Aug 2011 16:46:11 +1200 >Subject: [PATCH] [SIGNED-OFF] Bug 6704 : Escaping html in the merging records, so " don't break the merge > >Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> >--- > .../prog/en/modules/cataloguing/merge.tt | 10 +++++----- > 1 files changed, 5 insertions(+), 5 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >index b7eb7f6..0d8a84c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >@@ -244,7 +244,7 @@ $(document).ready(function(){ > <input type="checkbox" checked="checked" class="subfieldpick" id="rec_1_[% subfiel.subkey %]" /> > <span class="subfield">[% subfiel.subtag %]</span> / [% subfiel.value %] > <input type="hidden" name="tag_[% subfiel.tag %]_code_[% subfiel.subtag %]_[% subfiel.key %]_[% subfiel.subkey %]" value="[% subfiel.subtag %]" /> >- <input type="hidden" name="tag_[% subfiel.tag %]_subfield_[% subfiel.subtag %]_[% subfiel.key %]_[% subfiel.subkey %]" value="[% subfiel.value %]" /> >+ <input type="hidden" name="tag_[% subfiel.tag %]_subfield_[% subfiel.subtag %]_[% subfiel.key %]_[% subfiel.subkey %]" value="[% subfiel.value |html%]" /> > </li> > [% END %] > </ul> >@@ -271,7 +271,7 @@ $(document).ready(function(){ > <input type="hidden" name="tag_[% fiel.tag %]_indicator2_[% fiel.key %]" value="[% fiel.indicator2 %]" /> > [% IF ( fiel.value ) %] / [% fiel.value %] > <input type="hidden" name="tag_[% fiel.tag %]_code_00_[% fiel.key %]" value="00" /> >- <input type="hidden" name="tag_[% fiel.tag %]_subfield_00_[% fiel.key %]" value="[% fiel.value %]" /> >+ <input type="hidden" name="tag_[% fiel.tag %]_subfield_00_[% fiel.key %]" value="[% fiel.value |html%]" /> > [% END %] > > [% IF ( fiel.subfield ) %] >@@ -281,7 +281,7 @@ $(document).ready(function(){ > <input type="checkbox" class="subfieldpick" id="rec_2_[% subfiel.subkey %]" /> > <span class="subfield">[% subfiel.subtag %]</span> / [% subfiel.value %] > <input type="hidden" name="tag_[% subfiel.tag %]_code_[% subfiel.subtag %]_[% subfiel.key %]_[% subfiel.subkey %]" value="[% subfiel.subtag %]" /> >- <input type="hidden" name="tag_[% subfiel.tag %]_subfield_[% subfiel.subtag %]_[% subfiel.key %]_[% subfiel.subkey %]" value="[% subfiel.value %]" /> >+ <input type="hidden" name="tag_[% subfiel.tag %]_subfield_[% subfiel.subtag %]_[% subfiel.key %]_[% subfiel.subkey %]" value="[% subfiel.value |html%]" /> > </li> > [% END %] > </ul> >@@ -312,7 +312,7 @@ $(document).ready(function(){ > [% IF ( fiel.value ) %] / > [% fiel.value %] > <input type="hidden" name="tag_[% fiel.tag %]_code_00_[% fiel.key %]" value="00" /> >- <input type="hidden" name="tag_[% fiel.tag %]_subfield_00_[% fiel.key %]" value="[% fiel.value %]" /> >+ <input type="hidden" name="tag_[% fiel.tag %]_subfield_00_[% fiel.key %]" value="[% fiel.value |html%]" /> > [% END %] > > [% IF ( fiel.subfield ) %] >@@ -321,7 +321,7 @@ $(document).ready(function(){ > <li id="k[% subfiel.subkey %]"> > <span class="subfield">[% subfiel.subtag %]</span> / [% subfiel.value %] > <input type="hidden" name="tag_[% subfiel.tag %]_code_[% subfiel.subtag %]_[% subfiel.key %]_[% subfiel.subkey %]" value="[% subfiel.subtag %]" /> >- <input type="hidden" name="tag_[% subfiel.tag %]_subfield_[% subfiel.subtag %]_[% subfiel.key %]_[% subfiel.subkey %]" value="[% subfiel.value %]" /> >+ <input type="hidden" name="tag_[% subfiel.tag %]_subfield_[% subfiel.subtag %]_[% subfiel.key %]_[% subfiel.subkey %]" value="[% subfiel.value |html%]" /> > </li> > [% END %] > </ul> >-- >1.7.2.3
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 6704
:
5200
| 5207 |
5216