Attachment 73697 Details for Bug 18904 – Bug 18904 (follow-up) Set indicators and correct js path

[patch] Bug 18904 (follow-up) Set indicators and correct js path

Bug-18904-follow-up-Set-indicators-and-correct-js-.patch (text/plain), 3.76 KB, created by Nick Clemens (kidclamp) on 2018-04-05 14:12:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nick Clemens (kidclamp)

Created: 2018-04-05 14:12:00 UTC

Size: 3.76 KB

patch

obsolete

>From a2a482a9bbf970edb4004a11189017514ef2bced Mon Sep 17 00:00:00 2001
>From: Nick Clemens <nick@bywatersolutions.com>
>Date: Thu, 15 Mar 2018 10:18:54 +0000
>Subject: [PATCH] Bug 18904 (follow-up) Set indicators and correct js path
>
>TO test:
>1 - Have an authority with some indicators
>2 - Link a field in rancor to that authority
>3 - See that you get some indicators (same in unimarc, diff in marc21)
>---
> authorities/blinddetail-biblio-search.pl                          | 8 ++++----
> .../prog/en/modules/authorities/blinddetail-biblio-search.tt      | 6 ++++--
> koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt     | 2 +-
> 3 files changed, 9 insertions(+), 7 deletions(-)
>
>diff --git a/authorities/blinddetail-biblio-search.pl b/authorities/blinddetail-biblio-search.pl
>index ed09d3e..47905fb 100755
>--- a/authorities/blinddetail-biblio-search.pl
>+++ b/authorities/blinddetail-biblio-search.pl
>@@ -145,15 +145,15 @@ my $tag_number = $index;
> $tag_number =~ s/^tag_(\d*)_.*$/$1/;
> 
> # Remove spaces in indicators
>-$indicator1 =~ s/\s//g;
>-$indicator2 =~ s/\s//g;
>+$indicator1 =~ s/\s//g if $indicator1;
>+$indicator2 =~ s/\s//g if $indicator2;;
> 
> $template->param(
>     authid          => $authid ? $authid : "",
>     index           => $index,
>     tagid           => $tagid,
>-    indicator1      => $indicator1,
>-    indicator2      => $indicator2,
>+    indicator1      => $indicator1 || "",
>+    indicator2      => $indicator2 || "",
>     SUBFIELD_LOOP   => \@subfield_loop,
>     tag_number      => $tag_number,
> );
>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 2cd5a3f..1f7c202 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
>@@ -20,9 +20,11 @@
>     <script type="text/javascript">
>         $(document).ready(function(){
>             [% IF tag_number == 'rancor' %]
>-            function RancorReplaceField( new_text ){
>+            function RancorReplaceField( new_text, ind_1, ind_2 ){
>                 var cur_field = opener.opener.jQuery(".CodeMirror")[0].CodeMirror.marceditor.getCurrentField();
>                 cur_field.setText(new_text);
>+                cur_field.setIndicator1(ind_1);
>+                cur_field.setIndicator2(ind_2);
>                 return true;
>             }
>                 [% IF ( clear ) %]
>@@ -36,7 +38,7 @@
>                     [%- END -%]
>                 [%- END -%]â¡9[% authid %]";
>                 [% END %]
>-                RancorReplaceField( new_line );
>+                RancorReplaceField( new_line, "[% indicator1 %]", "[% indicator2 %]" );
>             [% ELSE %]
>             var index_start = "[% index %]";
>             var whichfield;
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt
>index a302c91..33d9992 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt
>@@ -6,7 +6,7 @@
> <link rel="stylesheet" href="[% interface %]/lib/codemirror/codemirror_[% KOHA_VERSION %].css" />
> <link rel="stylesheet" href="[% interface %]/[% theme %]/css/humanmsg_[% KOHA_VERSION %].css" />
> <script src="[% interface %]/lib/jquery/plugins/humanmsg.js" type="text/javascript"></script>
>-<script src="[% interface %]/prog/js/cataloging.js" type="text/javascript"></script>
>+<script src="[% interface %]/[% theme %]/js/cataloging_[% KOHA_VERSION %].js" type="text/javascript"></script>
> [% IF ( bidi ) %]
>    <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/right-to-left_[% KOHA_VERSION %].css" />
> [% END %]
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 18904: 64859 | 64860 | 65144 | 65145 | 65863 | 65864 | 65865 | 65866 | 68678 | 68679 | 68680 | 68681 | 71747 | 71748 | 71749 | 71750 | 71751 | 72920 | 73693 | 73694 | 73695 | 73696 | 73697 | 73766 | 73767 | 73768 | 73769 | 73770 | 73771 | 73851 | 73852 | 73853 | 73854 | 73855 | 73856 | 73857 | 74023 | 74055