From 8ba984afc04bc90bbb61cba2ef26c5038c360526 Mon Sep 17 00:00:00 2001 From: Andreas Roussos Date: Thu, 15 Sep 2016 11:37:19 +0300 Subject: [PATCH] Bug 10768 - Improve the interface related to itemBarcodeFallbackSearch MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit When the itemBarcodeFallbackSearch syspref is on, the wording in the interface should reflect that you can enter a barcode OR a keyword. Additionally, in the results of a keyword search the "Fast cataloging" link should be more descriptive. This patch fixes these issues. Test plan: 0) [PREREQUISITES] Ensure you have a Fast Add ('FA') framework defined, and that your itemBarcodeFallbackSearch syspref is set to 'Enable'. 1) Go to Circulation -> Check out, search for a patron, then select a patron to Check out. Notice how the text above the textbox reads "Enter item barcode:". 2) Type something generic (not a barcode) in the textbox so that you'll get at least one item as a result. Notice how the text in the yellow warning box reads "The barcode was not found: Fast cataloging". 3) Apply the patch. 4) Repeat step 1), now the text above the textbox should read "Enter item barcode or keyword:". 5) Repeat step 2), now the text in the yellow warning box should read "The barcode was not found: Add record using fast cataloging". Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall (cherry picked from commit 6fc03f1968f9e405d745b854577c953106fdbdfe) Signed-off-by: Frédéric Demians (cherry picked from commit 68c21aabe99fb12ef3987a142f5cc0389422a7bd) Signed-off-by: Julian Maurice --- .../intranet-tmpl/prog/en/modules/circ/circulation.tt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index 3042c1efc6..8551627108 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -435,7 +435,7 @@ $(document).ready(function() {
  • The barcode was not found: [% barcode |html %] [% IF ( fast_cataloging ) %] [% IF ( CAN_user_editcatalogue_fast_cataloging ) %] - Fast cataloging + Add record using fast cataloging [% END %] [% END %] @@ -633,7 +633,11 @@ No patron matched [% message | html %] -
    Enter item barcode:
    + [% IF Koha.Preference('itemBarcodeFallbackSearch') %] +
    Enter item barcode or keyword:
    + [% ELSE %] +
    Enter item barcode:
    + [% END %] [% IF NEEDSCONFIRMATION %] -- 2.39.5