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.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
This commit is contained in:
Jared Camins-Esakov 2013-06-16 07:54:04 -04:00 committed by Galen Charlton
parent 56ea0f7e0f
commit 4712fc66f0
1 changed files with 10 additions and 2 deletions

View File

@ -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%]" />