Bug 22914: Add holds column to batch item delete to fix show/hide columns behaviour

The changes on 19490 caused a bug, where the show/hide column feature hides the
wrong column on the items table. The two templates share a js file, and
the data passed is the same.

Adding the column to the template brings things back into alignment,
the data is already there, we just show it.

TEST PLAN:
1. Go to Tools > Batch item deletion and enter at least one barcode.
2. Try to hide a column that is showing
3. Notice it hides the wrong column
4. apply patch
5. repeat steps 1 and 2.
6. Notice the correct column is being hidden
7. Verify the new column for number of holds on the item works correctly
   for item and record level holds

Signed-off-by: Lisette Scheer <lisetteslatah@gmail.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
This commit is contained in:
Lucas Gass 2019-05-13 18:05:38 +00:00 committed by Nick Clemens
parent 427e4ebc6b
commit bb06060c4c

View file

@ -97,14 +97,53 @@
<tr> <tr>
[% IF ( show ) %]<th>&nbsp;</th>[% END %] [% IF ( show ) %]<th>&nbsp;</th>[% END %]
<th class="anti-the">Title</th> <th class="anti-the">Title</th>
<th class="holds_count" title="Item holds / Total holds">Holds</th>
[% FOREACH item_header_loo IN item_header_loop %] [% FOREACH item_header_loo IN item_header_loop %]
<th> [% item_header_loo.header_value | html %] </th> <th> [% item_header_loo.header_value | html %] </th>
[% END %] [% END %]
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
[% FOREACH item_loo IN item_loop %] <tr> [% IF ( show ) %][% IF ( item_loo.nomod ) %] <td class="error">Cannot edit</td>[% ELSE %]<td><input type="checkbox" name="itemnumber" value="[% item_loo.itemnumber | html %]" id="row[% item_loo.itemnumber | html %]" checked="checked" /></td>[% END %][% END %] [% FOREACH item_loo IN item_loop %]
<td><label for="row[% item_loo.itemnumber | html %]"><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item_loo.biblionumber | uri %]">[% item_loo.title | html %]</a>[% IF ( item_loo.author ) %], by [% item_loo.author | html %][% END %]</label></td> <tr>
[% IF show %]
[% IF item_loo.nomod %]
<td class="error">Cannot edit</td>
[% ELSE %]
<td><input type="checkbox" name="itemnumber" value="[% item_loo.itemnumber | html %]" id="row[% item_loo.itemnumber | html %]" checked="checked" data-is-onloan="[% item_loo.onloan | html %]" /></td>
[% END %]
[% ELSE %]
<td>&nbsp;</td>
[% END %]
<td>
<label for="row[% item_loo.itemnumber | html %]">
<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item_loo.biblionumber | uri %]">
[% item_loo.title | html %]
</a>
[% IF ( item_loo.author ) %], by [% item_loo.author | html %][% END %]
</label>
</td>
<td class="holds_count">
[% IF item_loo.holds %]
[% IF item_loo.item_holds %]
<a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% item_loo.biblionumber | uri %]" title="Holds on this item: [% item_loo.item_holds | html %] / Total holds on this record: [% item_loo.holds | html -%]" >
[% ELSE %]
<a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% item_loo.biblionumber | uri %]" title="No holds on this item / Total holds on this record: [% item_loo.holds | html -%]" >
[% END %]
[% ELSE %]
[% IF item_loo.holds %]
<a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% item_loo.biblionumber | uri %]" title="Holds on this record: [% item_loo.holds | html -%]" >
[% ELSE %]
<a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% item_loo.biblionumber | uri %]" title="No holds on this record" >
[% END %]
[% END %]
[% IF item_loo.holds %]
[% item_loo.item_holds | html %]/[% item_loo.holds | html %]
[% ELSE %]
[% item_loo.holds | html %]
[% END %]
</a>
</td>
[% FOREACH item_valu IN item_loo.item_value %] <td>[% item_valu.field | html %]</td> [% FOREACH item_valu IN item_loo.item_value %] <td>[% item_valu.field | html %]</td>
[% END %] </tr> [% END %] </tr>
[% END %] [% END %]