From 9e5297efaaf9f5fd55d10e163ba275f4e04562ee Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Fri, 6 Apr 2018 12:30:16 +0000 Subject: [PATCH] Bug 18904: (follow-up) Rebase onto 14769 Signed-off-by: Marcel de Rooy Amended: simplified if-then-else around cur_field.setIndicator[12]. Signed-off-by: Jonathan Druart --- authorities/blinddetail-biblio-search.pl | 4 ++++ .../intranet-tmpl/lib/koha/cateditor/marc-editor.js | 2 +- .../modules/authorities/blinddetail-biblio-search.tt | 10 +++------- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/authorities/blinddetail-biblio-search.pl b/authorities/blinddetail-biblio-search.pl index 0afeb96b8b..f8ae22b242 100755 --- a/authorities/blinddetail-biblio-search.pl +++ b/authorities/blinddetail-biblio-search.pl @@ -112,6 +112,8 @@ if ($authid) { $template->param( "clear" => 1 ); } + + $template->param( authid => $authid ? $authid : "", index => $index, @@ -122,6 +124,8 @@ $template->param( indicator2 => $indicator2, SUBFIELD_LOOP => \@subfield_loop, tag_number => $tag_number, + rancor => $index =~ /rancor$/, ); + output_html_with_http_headers $query, $cookie, $template->output; diff --git a/koha-tmpl/intranet-tmpl/lib/koha/cateditor/marc-editor.js b/koha-tmpl/intranet-tmpl/lib/koha/cateditor/marc-editor.js index ca547eca0a..df72d108bb 100644 --- a/koha-tmpl/intranet-tmpl/lib/koha/cateditor/marc-editor.js +++ b/koha-tmpl/intranet-tmpl/lib/koha/cateditor/marc-editor.js @@ -171,7 +171,7 @@ define( [ 'marc-record', 'koha-backend', 'preferences', 'text-marc', 'widget' ], if ( !field ) return; if ( authInfo[field.tag] == undefined ) return; authtype = authInfo[field.tag].authtypecode; - index = 'rancor'; + index = 'tag_'+field.tag+'_rancor'; var mainmainstring = ''; if( field.getSubfields( authInfo[field.tag].subfield ).length != 0 ){ mainmainstring += field.getSubfields( authInfo[field.tag].subfield )[0].text; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/blinddetail-biblio-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/blinddetail-biblio-search.tt index f57667cabf..f1613e8973 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/blinddetail-biblio-search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/blinddetail-biblio-search.tt @@ -15,16 +15,15 @@ - [% MACRO jsinclude BLOCK %]