From cb82ca95ec579b6ad05b24163673e68039f56520 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Wed, 12 Apr 2017 16:06:29 +0200 Subject: [PATCH] Bug 14399: Results form also needs a few interface changes 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 Signed-off-by: Kyle M Hall (cherry picked from commit af89df12e72ea51010039a2206bb942bcc4c4b50) Signed-off-by: Katrin Fischer --- .../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 642623eeef..eee528c68d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt @@ -269,14 +269,14 @@ $(document).ready(function(){ - [% UNLESS compareinv2barcd %] + [% UNLESS uploadedbarcodesflag %] [% END %] - [% UNLESS compareinv2barcd %][% END %] + [% UNLESS uploadedbarcodesflag %][% END %] @@ -291,7 +291,7 @@ $(document).ready(function(){ [% FOREACH result IN loop %] - [% UNLESS compareinv2barcd %] + [% UNLESS uploadedbarcodesflag %] @@ -342,7 +342,7 @@ $(document).ready(function(){
SeenSeenBarcode Library Title
- [% UNLESS compareinv2barcd %] + [% UNLESS uploadedbarcodesflag %] diff --git a/tools/inventory.pl b/tools/inventory.pl index 76a09252fa..1ee40a1014 100755 --- a/tools/inventory.pl +++ b/tools/inventory.pl @@ -123,6 +123,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.39.5