From cc4dded5476d53a2d86cc8effe8eca3bc23c3206 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 8 Apr 2015 10:48:26 +0200 Subject: [PATCH] [PASSED QA] Bug 6007: Fix MARC framework display when only used tags/subfields The "Display only used tags/subfields" output breaks DataTables and the output is unusable. Test plan: 1/ Go on admin/marctagstructure.pl after you have selected a framework 2/ Check the checkbox 3/ The table should be correctly displayed. Before this patch, the table have 2 lines per tag, now all data are contained into the same line. Signed-off-by: Josef Moravec Signed-off-by: Kyle M Hall --- .../prog/en/modules/admin/marctagstructure.tt | 26 +++++++++---------- 1 files changed, 12 insertions(+), 14 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt index 049f419..17ee420 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt @@ -188,13 +188,21 @@ $(document).ready(function() { Edit Delete - + [% IF ( select_display ) %] [% FOREACH loo IN loop %] - + [% loo.tagfield %] - [% loo.liblibrarian %] + + [% loo.liblibrarian %] + [% FOREACH subfield IN loo.subfields %] +

+ Tab:[% subfield.tab %] | $[% subfield.tagsubfield %] + [% subfield.liblibrarian %] [% IF ( subfield.kohafield ) %][% subfield.kohafield %][% END %][% IF ( subfield.repeatable ) %], repeatable[% END %][% IF ( subfield.mandatory ) %], Mandatory[% END %][% IF ( subfield.seealso ) %], See [% subfield.seealso %][% END %][% IF ( subfield.authorised_value ) %], [% subfield.authorised_value %][% END %][% IF ( subfield.authtypecode ) %], [% subfield.authtypecode %][% END %][% IF ( subfield.value_builder ) %], [% subfield.value_builder %][% END %] +

+ [% END %] + [% IF ( loo.repeatable ) %]Yes[% ELSE %]No[% END %] [% IF ( loo.mandatory ) %]Yes[% ELSE %]No[% END %] [% loo.authorised_value %] @@ -202,20 +210,10 @@ $(document).ready(function() { Edit Delete - [% IF ( loop.odd ) %][% ELSE %][% END %] -   - - [% FOREACH subfield IN loo.subfields %] -

Tab:[% subfield.tab %] | $[% subfield.tagsubfield %] - [% subfield.liblibrarian %] [% IF ( subfield.kohafield ) %][% subfield.kohafield %][% END %][% IF ( subfield.repeatable ) %], repeatable[% END %][% IF ( subfield.mandatory ) %], Mandatory[% END %][% IF ( subfield.seealso ) %], See [% subfield.seealso %][% END %][% IF ( subfield.authorised_value ) %], [% subfield.authorised_value %][% END %][% IF ( subfield.authtypecode ) %], [% subfield.authtypecode %][% END %][% IF ( subfield.value_builder ) %], [% subfield.value_builder %][% END %] -

- [% END %] - - [% END %] [% ELSE %] [% FOREACH loo IN loop %] - [% IF ( loop.odd ) %][% ELSE %][% END %] + [% loo.tagfield %] [% loo.liblibrarian %] [% IF ( loo.repeatable ) %]Yes[% ELSE %]No[% END %] -- 1.7.2.5