gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <josef.moravec@gmail.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
This commit is contained in:
Jonathan Druart 2015-04-08 10:48:26 +02:00 committed by Tomas Cohen Arazi
parent 5f9f555c72
commit f5ef85a345
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
View File

@ -188,13 +188,21 @@ $(document).ready(function() {
<th>Edit</th>
<th>Delete</th>
</tr>
</thead>
</thead>
<tbody>
[% IF ( select_display ) %]
[% FOREACH loo IN loop %]
<tr>
<tr>
<td>[% loo.tagfield %]</td>
<td>[% loo.liblibrarian %]</td>
<td>
[% loo.liblibrarian %]
[% FOREACH subfield IN loo.subfields %]
<p>
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 %]
</p>
[% END %]
</td>
<td>[% IF ( loo.repeatable ) %]Yes[% ELSE %]No[% END %]</td>
<td>[% IF ( loo.mandatory ) %]Yes[% ELSE %]No[% END %]</td>
<td>[% loo.authorised_value %]</td>
@ -202,20 +210,10 @@ $(document).ready(function() {
<td><a href="[% loo.edit %]">Edit</a></td>
<td><a href="[% loo.delete %]">Delete</a></td>
</tr>
[% IF ( loop.odd ) %]<tr>[% ELSE %]<tr class="highlight">[% END %]
<td>&nbsp;</td>
<td colspan="7">
[% FOREACH subfield IN loo.subfields %]
<p> 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 %]
</p>
[% END %]
</td>
</tr>
[% END %]
[% ELSE %]
[% FOREACH loo IN loop %]
[% IF ( loop.odd ) %]<tr>[% ELSE %]<tr class="highlight">[% END %]
<tr>
<td>[% loo.tagfield %]</td>
<td>[% loo.liblibrarian %]</td>
<td>[% IF ( loo.repeatable ) %]Yes[% ELSE %]No[% END %]</td>