Attachment 114408 Details for Bug 27240 – Bug 2740: Basket export cleanup.

[patch] Bug 2740: Basket export cleanup.

Bug-2740-Basket-export-cleanup.patch (text/plain), 7.58 KB, created by Didier Gautheron on 2020-12-15 13:43:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Didier Gautheron

Created: 2020-12-15 13:43:54 UTC

Size: 7.58 KB

patch

obsolete

>From 8b36cf462ee3bd79fc53071c9a9fc81ab2f00d63 Mon Sep 17 00:00:00 2001
>From: Didier Gautheron <didier.gautheron@biblibre.com>
>Date: Tue, 15 Dec 2020 14:41:11 +0100
>Subject: [PATCH] Bug 2740: Basket export cleanup.
>
>Remove spaces and irrelevant links.
>
>Test plan:
>1 - Create a basket
>2 - Export it in excel
>3 - There's a lot of spaces in Order column and irrelevant 'Add internal note'
>4 - Apply patch
>5 - Export file
>6 - It's tidier, fewer spaces and no useless Add/edit note links
>
>https://bugs.koha-community.org/show_bug.cgi?id=27240
>---
> .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 30 +++++++++++-----------
> 1 file changed, 15 insertions(+), 15 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
>index ddd8df99ae..263aea6994 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
>@@ -485,33 +485,33 @@
> <td>
> 
> [% IF ( books_loo.order_received ) %] (received)[% END %]
>- [% IF books_loo.title %]
>- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% books_loo.biblionumber | uri %]">[% books_loo.title | html %]</a>[% IF books_loo.author %] by [% books_loo.author | html %][% END %]
>- [% ELSE %]
>+ [%- IF books_loo.title %]
>+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% books_loo.biblionumber | uri %]">[% books_loo.title | html %]</a>[% IF books_loo.author %] by [% books_loo.author | html %][% END -%]
>+ [%- ELSE -%]
> Deleted bibliographic record, can't find title 
>- [% END %]
>+ [%- END %]
> 
>- [% IF ( books_loo.isbn ) %] - [% books_loo.isbn | html %][% END %]
>- [% IF ( books_loo.issn ) %] - [% books_loo.issn | html %][% END %]
>- [% IF ( books_loo.publishercode ) %], [% books_loo.publishercode | html %][% END %]
>- [% IF ( books_loo.publicationyear ) %], [% books_loo.publicationyear | html %]
>- [% ELSIF ( books_loo.copyrightdate ) %] [% books_loo.copyrightdate | html %][% END %]
>- [% IF ( books_loo.editionstatement ) %], [% books_loo.editionstatement | html %][% END %]
>- [% IF ( books_loo.suggestionid ) %]
>+ [%- IF ( books_loo.isbn ) %] - [% books_loo.isbn | html %][% END -%]
>+ [%- IF ( books_loo.issn ) %] - [% books_loo.issn | html %][% END -%]
>+ [%- IF ( books_loo.publishercode ) %], [% books_loo.publishercode | html %][% END -%]
>+ [%- IF ( books_loo.publicationyear ) %], [% books_loo.publicationyear | html -%]
>+ [%- ELSIF ( books_loo.copyrightdate ) %] [% books_loo.copyrightdate | html %][% END -%]
>+ [%- IF ( books_loo.editionstatement ) %], [% books_loo.editionstatement | html %][% END -%]
>+ [%- IF ( books_loo.suggestionid ) %]
> 
> Suggested by: [% books_loo.surnamesuggestedby | html %][% IF ( books_loo.firstnamesuggestedby ) %],Â [% books_loo.firstnamesuggestedby | html %] [% END %]
> (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% books_loo.suggestionid | uri %]&amp;op=show">suggestion #[% books_loo.suggestionid | html %]</a>)
> [% END %]
> 
> [% IF ( books_loo.order_internalnote ) %]
>- Internal note: [% books_loo.order_internalnote | html %] <a class="edit_note" data-ordernumber="[% books_loo.ordernumber | html %]" data-note_type="internal" href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber | html %]&type=internal" title="Edit internal note"> Edit internal note</a>
>+ Internal note: [% books_loo.order_internalnote | html %] <a class="edit_note noExport" data-ordernumber="[% books_loo.ordernumber | html %]" data-note_type="internal" href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber | html %]&type=internal" title="Edit internal note"> Edit internal note</a>
> [% ELSE %]
>- <a class="edit_note" data-ordernumber="[% books_loo.ordernumber | html %]" data-note_type="internal" href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber | html %]&type=internal" title="Add internal note"> Add internal note</a>
>+ <a class="edit_note noExport" data-ordernumber="[% books_loo.ordernumber | html %]" data-note_type="internal" href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber | html %]&type=internal" title="Add internal note"> Add internal note</a>
> [% END %]
> [% IF ( books_loo.order_vendornote ) %]
>- Vendor note: [% books_loo.order_vendornote | html %] <a class="edit_note" data-ordernumber="[% books_loo.ordernumber | html %]" data-note_type="vendor" href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber | html %]&type=vendor" title="Edit vendor note"> Edit vendor note</a>
>+ Vendor note: [% books_loo.order_vendornote | html %] <a class="edit_note noExport" data-ordernumber="[% books_loo.ordernumber | html %]" data-note_type="vendor" href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber | html %]&type=vendor" title="Edit vendor note"> Edit vendor note</a>
> [% ELSE %]
>- <a class="edit_note" data-ordernumber="[% books_loo.ordernumber | html %]" data-note_type="vendor" href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber | html %]&type=vendor" title="Add vendor note"> Add vendor note</a>
>+ <a class="edit_note noExport" data-ordernumber="[% books_loo.ordernumber | html %]" data-note_type="vendor" href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber | html %]&type=vendor" title="Add vendor note"> Add vendor note</a>
> [% END %]
> [% IF (books_loo.transferred_from) %]
> [% basket = books_loo.transferred_from.basket %]
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 27240: 114408 | 119105 | 119825