Bugzilla – Attachment 63915 Details for
Bug 8612
CSV export profile to have custom fields in export csv basket
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 8612: [QA Follow-up] Remove two newlines from template output
Bug-8612-QA-Follow-up-Remove-two-newlines-from-tem.patch (text/plain), 2.47 KB, created by
Marcel de Rooy
on 2017-06-02 06:54:22 UTC
(
hide
)
Description:
Bug 8612: [QA Follow-up] Remove two newlines from template output
Filename:
MIME Type:
Creator:
Marcel de Rooy
Created:
2017-06-02 06:54:22 UTC
Size:
2.47 KB
patch
obsolete
>From e94245157f13aa681c685f114e9dddfd16fdfd90 Mon Sep 17 00:00:00 2001 >From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Date: Fri, 2 Jun 2017 08:08:57 +0200 >Subject: [PATCH] Bug 8612: [QA Follow-up] Remove two newlines from template > output >Content-Type: text/plain; charset=utf-8 > >When using the Default profile from the basket form, the resulting csv >file has an additional newline after the headers and at the end. >This patch removes them. >Unit test adjusted accordingly. > >Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >--- > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/csv/basket.tt | 5 +++-- > t/db_dependent/Acquisition/GetBasketAsCSV.t | 2 -- > 2 files changed, 3 insertions(+), 4 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/csv/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/csv/basket.tt >index 0ca6a84..6ee81aa 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/csv/basket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/csv/basket.tt >@@ -1,3 +1,4 @@ > [% INCLUDE csv_headers/acqui/basket.tt %] >-[% FOREACH r IN rows %]"[% r.contractname %]",[% r.ordernumber %],[% r.entrydate %],[% r.isbn %],"[% r.author %]","[% r.title %]",[% r.publicationyear %],"[% r.publishercode %]","[% r.collectiontitle %]","[% r.notes %]",[% r.quantity %],[% r.rrp %],"[% r.deliveryplace %]","[% r.billingplace %]" >-[% END %] >+[%- FOREACH r IN rows -%] >+"[% r.contractname %]",[% r.ordernumber %],[% r.entrydate %],[% r.isbn %],"[% r.author %]","[% r.title %]",[% r.publicationyear %],"[% r.publishercode %]","[% r.collectiontitle %]","[% r.notes %]",[% r.quantity %],[% r.rrp %],"[% r.deliveryplace %]","[% r.billingplace %]" >+[% END -%] >diff --git a/t/db_dependent/Acquisition/GetBasketAsCSV.t b/t/db_dependent/Acquisition/GetBasketAsCSV.t >index b6dfdbe..33e6f16 100644 >--- a/t/db_dependent/Acquisition/GetBasketAsCSV.t >+++ b/t/db_dependent/Acquisition/GetBasketAsCSV.t >@@ -72,9 +72,7 @@ is($basket_csv1, 'autor,title,quantity > # Use default template > my $basket_csv2 = C4::Acquisition::GetBasketAsCSV($basketno, $query); > is($basket_csv2, 'Contract name,Order number,Entry date,ISBN,Author,Title,Publication year,Publisher,Collection title,Note for vendor,Quantity,RRP,Delivery place,Billing place >- > "",' . $order->{ordernumber} . ',2016-01-02,,"King, Stephen","Test Record",,"","","",3,,"","" >- > ', 'CSV should be generated with default template'); > > my $basket_csv3 = C4::Acquisition::GetBasketAsCSV($basketno, $query, $csv_profile2->export_format_id); >-- >2.1.4
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 8612
:
11514
|
36860
|
37289
|
37293
|
41224
|
41225
|
41226
|
41227
|
42532
|
42533
|
42534
|
47591
|
47592
|
47593
|
56222
|
56223
|
56224
|
56225
|
57012
|
57013
|
57024
|
57025
|
57026
|
57027
|
57028
|
57029
|
57079
|
58073
|
58074
|
58075
|
58076
|
58077
|
58078
|
58079
|
58985
|
58986
|
58987
|
58988
|
58989
|
58990
|
58991
|
58992
|
59757
|
60480
|
61264
|
61265
|
61266
|
61267
|
61405
|
61520
|
63048
|
63049
|
63050
|
63051
|
63052
|
63053
|
63054
|
63055
|
63056
|
63104
|
63158
|
63279
|
63910
|
63911
|
63912
|
63913
|
63914
| 63915 |
63964
|
63966