From 51dc34eb8b0267e2d7d7edcae78acd2225e8473e Mon Sep 17 00:00:00 2001 From: Jared Camins-Esakov 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 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 %]
  • - + [% IF (defaultrecord) %] + + [% ELSE %] + + [% END %] [% fiel.tag %] @@ -21,7 +25,11 @@
      [% FOREACH subfiel IN fiel.subfield %]
    • - + [% IF (defaultrecord) %] + + [% ELSE %] + + [% END %] [% subfiel.subtag %] / [% subfiel.value %] -- 1.7.9.5