From de0d93c232380ad8fdd79eed27418666fa92d108 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Wed, 12 Apr 2017 16:06:29 +0200 Subject: [PATCH] Bug 14399: [16.05.X] Results form also needs a few interface changes Content-Type: text/plain; charset=utf-8 Currently, the value of compareinv2barcd is used to determine if the Seen column, the Select/Clear all buttons and the Mark seen buttons are displayed. But if we scanned barcodes, we already marked items as seen. So we should only display these buttons when we did not upload barcodes. Test plan: [1] Upload a barcode file. Check that the result form does not show the buttons. [2] Generate an inventory list, so do not upload a barcode file. Verify that you still see the buttons. Signed-off-by: Marcel de Rooy Signed-off-by: Josef Moravec Signed-off-by: Martin Renvoize --- koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt | 8 ++++---- tools/inventory.pl | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt index 56958ac..1008528 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt @@ -272,14 +272,14 @@ $(document).ready(function(){ - [% UNLESS compareinv2barcd %] + [% UNLESS uploadedbarcodesflag %]
[Select all] [Clear all]
[% END %] - [% UNLESS compareinv2barcd %][% END %] + [% UNLESS uploadedbarcodesflag %][% END %] @@ -294,7 +294,7 @@ $(document).ready(function(){ [% FOREACH result IN loop %] - [% UNLESS compareinv2barcd %] + [% UNLESS uploadedbarcodesflag %] @@ -345,7 +345,7 @@ $(document).ready(function(){
SeenSeenBarcode Library Title
- [% UNLESS compareinv2barcd %] + [% UNLESS uploadedbarcodesflag %]
[Select all] [Clear all]
diff --git a/tools/inventory.pl b/tools/inventory.pl index 6e298da..fb4d319 100755 --- a/tools/inventory.pl +++ b/tools/inventory.pl @@ -134,6 +134,7 @@ $template->param( branch => $branch, datelastseen => $datelastseen, compareinv2barcd => $compareinv2barcd, + uploadedbarcodesflag => $uploadbarcodes ? 1 : 0, ); # Walk through uploaded barcodes, report errors, mark as seen, check in -- 2.1.4