Bugzilla – Attachment 19466 Details for
Bug 9755
Record merge code needs to be refactored
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[PASSED QA] Bug 9755 QA follow-up: fix template compliance
PASSED-QA-Bug-9755-QA-follow-up-fix-template-compl.patch (text/plain), 3.05 KB, created by
Katrin Fischer
on 2013-07-08 06:21:25 UTC
(
hide
)
Description:
[PASSED QA] Bug 9755 QA follow-up: fix template compliance
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2013-07-08 06:21:25 UTC
Size:
3.05 KB
patch
obsolete
>From 51dc34eb8b0267e2d7d7edcae78acd2225e8473e Mon Sep 17 00:00:00 2001 >From: Jared Camins-Esakov <jcamins@cpbibliography.com> >Date: Sun, 16 Jun 2013 07:54:04 -0400 >Subject: [PATCH] [PASSED QA] Bug 9755 QA follow-up: fix template compliance > >Fix the following test failure: >* koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc FAIL > forbidden patterns OK > tt_valid FAIL > lines 10, 24 > valid_template OK > >Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> >Passes all tests and QA script. >Found a pre-existing problem with non-repeating subfields >that i noted on the bug report. >All other tests were ok and merging records worked nicely. >--- > .../prog/en/includes/merge-record.inc | 12 ++++++++++-- > 1 file changed, 10 insertions(+), 2 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc >index 5b8524a..6644b2d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc >@@ -7,7 +7,11 @@ > [% FOREACH record IN records %] > [% FOREACH fiel IN record.field %] > <li id="k[% fiel.key %]"> >- <input type="checkbox" [% IF (defaultrecord) %]checked="checked"[% END %] class="fieldpick" id="rec_[% recordnumber %]_[% fiel.key %]" /> >+ [% IF (defaultrecord) %] >+ <input type="checkbox" checked="checked" class="fieldpick" id="rec_[% recordnumber %]_[% fiel.key %]" /> >+ [% ELSE %] >+ <input type="checkbox" class="fieldpick" id="rec_[% recordnumber %]_[% fiel.key %]" /> >+ [% END %] > <span class="field">[% fiel.tag %]</span> > > <input type="hidden" name="tag_[% fiel.tag %]_indicator1_[% fiel.key %]" value="[% fiel.indicator1 %]" /> >@@ -21,7 +25,11 @@ > <ul> > [% FOREACH subfiel IN fiel.subfield %] > <li id="k[% subfiel.subkey %]"> >- <input type="checkbox" [% IF (defaultrecord) %]checked="checked"[% END %] class="subfieldpick" id="rec_[% recordnumber %]_[% subfiel.subkey %]" /> >+ [% IF (defaultrecord) %] >+ <input type="checkbox" checked="checked" class="subfieldpick" id="rec_[% recordnumber %]_[% subfiel.subkey %]" /> >+ [% ELSE %] >+ <input type="checkbox" class="subfieldpick" id="rec_[% recordnumber %]_[% subfiel.subkey %]" /> >+ [% END %] > <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 |html%]" /> >-- >1.7.9.5
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 9755
:
15913
|
15922
|
18446
|
18512
|
18513
|
18531
|
18909
|
18910
|
19038
|
19464
|
19465
| 19466