From 2aa6518c8a000a824e2659eaffc3d1ac54156544 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Sat, 21 Nov 2015 22:37:03 +0100 Subject: [PATCH] Bug 14636: Item search - improving display - Changes "Publication Date" to "Publication date" in the CSV export - Fixes 'no JavaScript fallback' display to match the normal display - only show 'by' when it's UNIMARC and an author exist - show copyrightdate if publicationyear is empty To test: - Turn of Javascript in your browser before you item search. This will activate the alternative display. - For MARC21: - Verify that the author displays when existing and no 'by' is shown. - Verify that the publication date is now shown. - For UNIMARC: - Verify that 'by' only displays when there is an author to display. - Verify that the publication date is still shown. - Try the CSV export. - Verify that the CSV header now reads 'Publication date'. Signed-off-by: Owen Leonard Successfully tested non-JS behavior and CSV export. DID NOT test UNIMARC. Signed-off-by: Fridolin Somers Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall --- .../prog/en/includes/catalogue/itemsearch_item.inc | 5 +++-- .../prog/en/includes/csv_headers/catalogue/itemsearch.tt | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.inc index 5b08b9134e..8f659134a8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.inc @@ -1,12 +1,13 @@ [%- USE Branches -%] +[%- USE Koha -%] [% biblio = item.biblio %] [% biblioitem = item.biblioitem %] [% biblio.title %] - by [% biblio.author %] + [% IF ( Koha.Preference( 'marcflavour' ) == 'UNIMARC' && biblio.author ) %] by[% END %] [% biblio.author |html %] - [% biblioitem.publicationyear %] + [% biblioitem.publicationyear || biblio.copyrightdate %] [% biblioitem.publishercode %] [% biblioitem.collectiontitle %] 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 28fabe707d..bac4b147f0 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 @@ -Title, Publication Date, Publisher, Collection, Barcode, Call number, Home library, Current location, Shelving location, Inventory number, Status, Checkouts +Title, Publication date, Publisher, Collection, Barcode, Call number, Home library, Current location, Shelving location, Inventory number, Status, Checkouts -- 2.39.5