Bugzilla – Attachment 21387 Details for
Bug 7298
export late orders, with # of claims and claim dates
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[PASSED QA] Bug 7298: QA Followup
PASSED-QA-Bug-7298-QA-Followup.patch (text/plain), 7.36 KB, created by
Katrin Fischer
on 2013-09-23 20:53:05 UTC
(
hide
)
Description:
[PASSED QA] Bug 7298: QA Followup
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2013-09-23 20:53:05 UTC
Size:
7.36 KB
patch
obsolete
>From 1acb6d8d192daaee7a3e9c44ca3391deda1c6015 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@biblibre.com> >Date: Mon, 23 Sep 2013 10:43:20 +0200 >Subject: [PATCH] [PASSED QA] Bug 7298: QA Followup > >- use Modern::Perl; >- GPL version >- tabs > >Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> >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. >--- > acqui/lateorders-export.pl | 20 +++++++------- > .../prog/en/modules/acqui/lateorders.tt | 2 +- > .../prog/en/modules/serials/claims.tt | 28 ++++++++++---------- > serials/lateissues-export.pl | 23 ++++++++-------- > 4 files changed, 36 insertions(+), 37 deletions(-) > >diff --git a/acqui/lateorders-export.pl b/acqui/lateorders-export.pl >index f363dab..585cac8 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 <http://www.gnu.org/licenses>. > > 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 b4a02e1..c76cf2d 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 %] > </select> > </ol> >- <fieldset class="action"><input type="submit" value="Filter" /></fieldset> >+ <fieldset class="action"><input type="submit" value="Filter" /></fieldset> > </fieldset> > </form> > [% 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 5e710f4..bae4f70 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt >@@ -36,20 +36,20 @@ > // 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; >- } >- // And redirecting to the CSV page >- location.href = url; >- return false; >- }); >+ 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; >+ } >+ // 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 57b9ffa..1559845 100755 >--- a/serials/lateissues-export.pl >+++ b/serials/lateissues-export.pl >@@ -2,21 +2,20 @@ > > # 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 <http://www.gnu.org/licenses>. > >-use strict; >-use warnings; >+use Modern::Perl; > use CGI; > use C4::Auth; > use C4::Serials; >-- >1.7.9.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 7298
:
7809
|
7891
|
7946
|
8333
|
10426
|
11713
|
11717
|
11721
|
11722
|
12624
|
12817
|
12818
|
15027
|
15028
|
15037
|
15038
|
15039
|
15040
|
16688
|
16689
|
16690
|
16691
|
16692
|
16956
|
19819
|
20313
|
20314
|
20315
|
20471
|
20472
|
20473
|
20474
|
21339
|
21383
|
21384
|
21385
|
21386
|
21387
|
21398
|
21523
|
22617
|
22618
|
22619
|
22620
|
22621
|
22622