Bugzilla – Attachment 73771 Details for
Bug 18904
Advanced editor - Rancor - Add authority support
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 18904: (follow-up) Rebase onto 14769
Bug-18904-follow-up-Rebase-onto-14769.patch (text/plain), 3.93 KB, created by
Nick Clemens (kidclamp)
on 2018-04-06 12:32:11 UTC
(
hide
)
Description:
Bug 18904: (follow-up) Rebase onto 14769
Filename:
MIME Type:
Creator:
Nick Clemens (kidclamp)
Created:
2018-04-06 12:32:11 UTC
Size:
3.93 KB
patch
obsolete
>From d2b5b08008b7009a077ceb3b2744331bb1cbeffd Mon Sep 17 00:00:00 2001 >From: Nick Clemens <nick@bywatersolutions.com> >Date: Fri, 6 Apr 2018 12:30:16 +0000 >Subject: [PATCH] Bug 18904: (follow-up) Rebase onto 14769 > >--- > authorities/blinddetail-biblio-search.pl | 4 ++++ > koha-tmpl/intranet-tmpl/lib/koha/cateditor/marc-editor.js | 2 +- > .../prog/en/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 0afeb96..f8ae22b 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 ca547ec..df72d10 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 f57667c..87b40f9 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 @@ > </div> > </div> > >- > [% MACRO jsinclude BLOCK %] > <script type="text/javascript"> > $(document).ready(function(){ >- [% IF tag_number == 'rancor' %] >+ [% IF rancor %] > 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); >+ if ( [% IF update_ind1 %]true[% ELSE %]false[% END %] ) cur_field.setIndicator1(ind_1); >+ if ( [% IF update_ind2 %]true[% ELSE %]false[% END %] ) cur_field.setIndicator2(ind_2); > return true; > } > [% IF ( clear ) %] >@@ -47,7 +46,6 @@ > } catch(e) { > return; > } >- > var field_start = whichfield.parentNode.parentNode; > > // Sets the good number of form fields for the specified subfield >@@ -107,7 +105,6 @@ > i++; > }); > } >- > [% UNLESS ( clear ) %] > [% FOREACH SUBFIELD_LOO IN SUBFIELD_LOOP %] > SetSubfieldValues( >@@ -117,7 +114,6 @@ > [% END %] > ); > [% END %] >- [% END %] > var indicators = field_start.getElementsByClassName('indicator flat'); > [% IF update_ind1 %] > indicators[0].value="[% indicator1 %]"; >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
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