Attachment 36159 Details for Bug 10971 – Bug 10971: Hide EAN search for MARC21 / template corrections

[patch] Bug 10971: Hide EAN search for MARC21 / template corrections

Bug-10971-Hide-EAN-search-for-MARC21--template-cor.patch (text/plain), 3.78 KB, created by Jonathan Druart on 2015-02-25 11:16:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2015-02-25 11:16:59 UTC

Size: 3.78 KB

patch

obsolete

>From effc9b1fb789b2695d32bd4d705b89bc043ee78e Mon Sep 17 00:00:00 2001
>From: Katrin Fischer <Katrin.Fischer.83@web.de>
>Date: Sat, 21 Feb 2015 19:22:33 +0100
>Subject: [PATCH] Bug 10971: Hide EAN search for MARC21 / template corrections
>
>This patch hides the EAN filter on the page for ordering from
>a subscription when the marcflavour is not UNIMARC as it will
>only work for this flavour currently.
>
>It also corrects
>- branch to library
>- supplier to vendor
>- the library code in the result list to the branch name
>
>To test:
>- Make sure you have a subscription, not the vendor
>- Create a new basket for the subscription vendor
>- Choose 'from a subscription' to create your order line
>- Look at the filters on the left side, switch
>  the marcflavour system preference to see change for
>  the EAN filter
>- Verify changes
>
>Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
>
>Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
>---
> koha-tmpl/intranet-tmpl/prog/en/includes/subscriptions-search.inc   | 6 ++++--
> .../intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt     | 4 +++-
> 2 files changed, 7 insertions(+), 3 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/subscriptions-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/subscriptions-search.inc
>index db65f93..4f6f1ca 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/subscriptions-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/subscriptions-search.inc
>@@ -12,20 +12,22 @@
>                 <label for="title">Title:</label>
>                 <input type="text" id="title" name="title_filter" value="[% title_filter %]" />
>               </li>
>+              [% IF Koha.Preference( 'marcflavour' ) == "UNIMARC" %]
>               <li>
>                 <label for="ean">EAN:</label>
>                 <input type="text" id="ean" name="EAN_filter" value="[% EAN_filter %]" />
>               </li>
>+              [% END %]
>               <li>
>                 <label for="publisher">Publisher:</label>
>                 <input type="text" id="publisher" name="publisher_filter" value="[% publisher_filter %]" />
>               </li>
>               <li>
>-                <label for="supplier">Supplier:</label>
>+                <label for="supplier">Vendor:</label>
>                 <input type="text" id="supplier" name="supplier_filter" value="[% supplier_filter %]" />
>               </li>
>               <li>
>-                <label for="branch">Branch:</label>
>+                <label for="branch">Library:</label>
>                 <select id="branch" name="branch_filter">
>                   <option value="">All</option>
>                   [% FOREACH branch IN branches_loop %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt
>index 18cfdec..14a3ef3 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt
>@@ -1,4 +1,6 @@
> [% USE KohaDates %]
>+[% USE Branches %]
>+[% USE Koha %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Koha &rsaquo; Serials [% biblionumber %]</title>
> <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
>@@ -75,7 +77,7 @@
>                                     [% IF (sub.internalnotes) %]([% sub.internalnotes %])[% END %]
>                                 </td>
>                                 <td>
>-                                    [% IF (sub.branchcode) %][% sub.branchcode %][% END %]
>+                                    [% IF (sub.branchcode) %][% Branches.GetName( sub.branchcode ) %][% END %]
>                                 </td>
>                                 <td>
>                                     [% IF (sub.callnumber) %][% sub.callnumber %][% END %]
>-- 
>2.1.0

Actions: View | Diff | Splinter Review

Attachments on bug 10971: 36111 | 36132 | 36159