From 85fd8e14d37948930f56b358e46bbaabe812bdce Mon Sep 17 00:00:00 2001 From: Olivia Lu Date: Thu, 17 Jan 2019 22:19:51 +0000 Subject: [PATCH] Bug 20171: Fixed CSV output to use syspref 'delimiter' in export files To Find Fix: 1. Go to sysprefs and change delimiter to slashes 2. Under the Search drop down click Item search 3. Set Output as CSV 4. Click Search 5. A file should be downloaded and when opened the set delimiter should appear as the delimiter Signed-off-by: mikael --- .../prog/en/includes/catalogue/itemsearch_item.csv.inc | 5 ++++- .../prog/en/includes/csv_headers/catalogue/itemsearch.tt | 7 ++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.csv.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.csv.inc index 39dad76eab..6673093dee 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.csv.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.csv.inc @@ -1,5 +1,8 @@ [%- USE Branches -%] [%- USE Koha -%] + +[%- SET delimiter = Koha.Preference( 'delimiter' ) || ',' -%] + [%- biblio = item.biblio | html -%] [%- biblioitem = item.biblioitem | html -%] -"[% biblio.title | html %] [% IF ( Koha.Preference( 'marcflavour' ) == 'UNIMARC' && biblio.author ) %]by [% END %][% biblio.author | html %]", "[% (biblioitem.publicationyear || biblio.copyrightdate) | html %]", "[% biblioitem.publishercode | html %]", "[% biblioitem.collectiontitle | html %]", "[% item.barcode | html %]", "[% item.itemcallnumber | html %]", "[% Branches.GetName(item.homebranch) | html %]", "[% Branches.GetName(item.holdingbranch) | html %]", "[% item.location | html %]", "[% item.stocknumber | html %]", "[% item.status | html %]", "[% (item.issues || 0) | html %]" +"[% biblio.title | html %] [% IF ( Koha.Preference( 'marcflavour' ) == 'UNIMARC' && biblio.author ) %]by [% END %][% biblio.author | html %]"[% delimiter %] "[% (biblioitem.publicationyear || biblio.copyrightdate) | html %]"[% delimiter %] "[% biblioitem.publishercode | html %]"[% delimiter %] "[% biblioitem.collectiontitle | html %]"[% delimiter %] "[% item.barcode | html %]"[% delimiter %] "[% item.itemcallnumber | html %]"[% delimiter %] "[% Branches.GetName(item.homebranch) | html %]"[% delimiter %] "[% Branches.GetName(item.holdingbranch) | html %]"[% delimiter %] "[% item.location | html %]"[% delimiter %] "[% item.stocknumber | html %]"[% delimiter %] "[% item.status | html %]"[% delimiter %] "[% (item.issues || 0) | html %]" diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/catalogue/itemsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/catalogue/itemsearch.tt index 8add507eec..9c29328a63 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/catalogue/itemsearch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/catalogue/itemsearch.tt @@ -1 +1,6 @@ -[%- BLOCK -%]Title, Publication date, Publisher, Collection, Barcode, Call number, Home library, Current location, Shelving location, Inventory number, Status, Checkouts[%- END -%] +[%- USE Koha -%] + +[%- SET delimiter = Koha.Preference( 'delimiter' ) || ',' -%] + + +[%- BLOCK -%]Title[% delimiter %]Publication date[% delimiter %]Publisher[% delimiter %]Collection[% delimiter %]Barcode[% delimiter %]Call number[% delimiter %]Home library[% delimiter %]Current location[% delimiter %]Shelving location[% delimiter %]Inventory number[% delimiter %]Status[% delimiter %]Checkouts[%- END -%] -- 2.17.1