From c2e46aacc772e3943a7c1c11854ddabf139396fe Mon Sep 17 00:00:00 2001 From: Mark Tompsett Date: Tue, 18 Mar 2014 11:44:42 -0400 Subject: [PATCH] Bug 11253 - tools/inventory.pl output_pref ignores 'iso' parameter passed Content-Type: text/plain; charset=utf-8 Took all the output_pref function calls and converted them to the newer hash format parameter. This then gave blank output. Looking at the template file, I decided that the html filter should be after the KohaDates filter. This corrected the display of the date for the dd/mm/yyyy case. TEST PLAN --------- Create a small barcode file from books in a given branch. Set I18N/L10N system preference of dateformat to mm/dd/yyyy. Go to inventory/stocktaking tool. Browse for the barcode file. Select the branch (i.e. not All libraries) to match. Click submit Table displays dates in "Unseen since" column. Set I18N/L10N system preference of dateformat to yyyy-mm-dd. Go to inventory/stocktaking tool. Browse for the barcode file. Select the branch (i.e. not All libraries) to match. Click submit Table displays dates in "Unseen since" column. Set I18N/L10N system preference of dateformat to dd/mm/yyyy. Go to inventory/stocktaking tool. Browse for the barcode file. Select the branch (i.e. not All libraries) to match. Click submit KABOOM! Apply patch Go to inventory/stocktaking tool. Browse for the barcode file. Select the branch (i.e. not All libraries) to match. Click submit Table displays dates in "Unseen since" column. Signed-off-by: Marcel de Rooy Before the patch, I had this error when using dateformat=ddmmyy: Template process failed: undef error - The 'day' parameter ("2014") to DateTime::new did not pass the 'an integer which is a possible valid day of month' callback at /usr/local/share/perl5/Params/Validate/PP.pm line 633. This patch corrects the problem. --- .../prog/en/modules/tools/inventory.tt | 2 +- tools/inventory.pl | 2 +- 2 files changed, 2 insertions(+), 2 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 9e2df51..cab07ed 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt @@ -249,7 +249,7 @@ $(document).ready(function(){ [% result.damaged | html %] - [% result.datelastseen | html | $KohaDates%] + [% result.datelastseen | $KohaDates | html %] [% IF result.problem == 'wrongplace' %] diff --git a/tools/inventory.pl b/tools/inventory.pl index 3d8939e..3db63af 100755 --- a/tools/inventory.pl +++ b/tools/inventory.pl @@ -151,7 +151,7 @@ my @errorloop; if ( $uploadbarcodes && length($uploadbarcodes) > 0 ) { my $dbh = C4::Context->dbh; my $date = dt_from_string( $input->param('setdate') ); - $date = output_pref( $date, 'iso' ); + $date = output_pref ( { dt => $date, dateformat => 'iso' } ); my $strsth = "select * from issues, items where items.itemnumber=issues.itemnumber and items.barcode =?"; my $qonloan = $dbh->prepare($strsth); -- 1.7.7.6