From 43adbda007545b610b3a350f359ff019737fa51b Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 23 Sep 2013 10:43:20 +0200 Subject: [PATCH] Bug 7298: (follow-up) various QA fixes - use Modern::Perl; - GPL version - tabs Signed-off-by: Katrin Fischer Passes QA script and all tests. Testing notes: - CSV header row is now translatable. Tested by updating the German po files and checking for the line. - Tested that claiming for late serial issues still works as expected, as one file has been renamed. Filed 10931 for untranslatable CSV contents. - Tested that claiming late orders still works: * Table searching and sorting Works nicely, but some columns could be split up for better searching and sorting: * Order date: 20/01/2013 (245 days) * Total cost: 10.00x1 = 10.00 Books => item type should be separate * Basket: 10 MPL => Library and basket number could be separate columns * Filters * Combined various filters, search results look correct. * Selecting order for claiming * Limiting by vendor makes it possible to check/uncheck all * With no vendor limit, entries for other vendors will be locked after the first checkbox is checked for one vendor * Exporting as CSV * Exported single line > CSV appears correct. * Exporting multiple lines > CSV appears correct. PROBLEM: Translated CSV don't work correctly, as line breaks are lost in the translation process. Needs to be fixed in a follow-up. * Sending serial claim email * No regressions found - there are some problems with the email contents noted on bug 7298. Signed-off-by: Galen Charlton --- acqui/lateorders-export.pl | 20 ++++++------- .../prog/en/modules/acqui/lateorders.tt | 2 +- .../prog/en/modules/serials/claims.tt | 28 +++++++++---------- serials/lateissues-export.pl | 20 ++++++------- 4 files changed, 35 insertions(+), 35 deletions(-) diff --git a/acqui/lateorders-export.pl b/acqui/lateorders-export.pl index f363dab188..585cac83c2 100755 --- a/acqui/lateorders-export.pl +++ b/acqui/lateorders-export.pl @@ -2,18 +2,18 @@ # This file is part of Koha. # -# Koha is free software; you can redistribute it and/or modify it under the -# terms of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. +# Koha is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. # -# Koha is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR -# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# Koha is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License along -# with Koha; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# You should have received a copy of the GNU General Public License +# along with Koha; if not, see . use Modern::Perl; use CGI; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt index b4a02e1ae3..c76cf2d709 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt @@ -217,7 +217,7 @@ $(document).ready(function() { [% END %] -
+
[% INCLUDE 'acquisitions-menu.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt index c8392e35e3..6b0b89dff1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt @@ -35,21 +35,21 @@ // We need to use "input[name=serialid]:checked" instead of "input:checked". Otherwise, the "check all" box will pass the value of "on" as a serialid, which produces a SQL error. var selected = $("input[name=serialid]:checked"); - if (selected.length == 0) { - alert(_("Please select at least one item to export.")); - return false; - } - - // Building the url from currently checked boxes - var url = '/cgi-bin/koha/serials/lateissues-export.pl?supplierid=&op=claims'; - for (var i = 0; i < selected.length; i++) { - url += '&serialid=' + selected[i].value; - } + if (selected.length == 0) { + alert(_("Please select at least one item to export.")); + return false; + } + + // Building the url from currently checked boxes + var url = '/cgi-bin/koha/serials/lateissues-export.pl?supplierid=&op=claims'; + for (var i = 0; i < selected.length; i++) { + url += '&serialid=' + selected[i].value; + } url += '&csv_profile=' + $("#csv_profile_for_export option:selected").val(); - // And redirecting to the CSV page - location.href = url; - return false; - }); + // And redirecting to the CSV page + location.href = url; + return false; + }); $("#titlefilter").keyup( function () { sTable.fnFilter( this.value, 3 ); // 3 is position of title column diff --git a/serials/lateissues-export.pl b/serials/lateissues-export.pl index 4103d3bfa7..97b5bbe430 100755 --- a/serials/lateissues-export.pl +++ b/serials/lateissues-export.pl @@ -2,18 +2,18 @@ # This file is part of Koha. # -# Koha is free software; you can redistribute it and/or modify it under the -# terms of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. +# Koha is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. # -# Koha is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR -# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# Koha is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License along -# with Koha; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# You should have received a copy of the GNU General Public License +# along with Koha; if not, see . use Modern::Perl; use CGI; -- 2.39.5