Attachment 154792 Details for Bug 34570 – Bug 34570: Remove use of "onclick" for PopupMARCFieldDoc()

[patch] Bug 34570: Remove use of "onclick" for PopupMARCFieldDoc()

Bug-34570-Remove-use-of-onclick-for-PopupMARCField.patch (text/plain), 3.05 KB, created by Marcel de Rooy on 2023-08-25 09:52:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel de Rooy

Created: 2023-08-25 09:52:39 UTC

Size: 3.05 KB

patch

obsolete

>From 35939c4e1aa008d881bd6f373d78bc50f4ec99bb Mon Sep 17 00:00:00 2001
>From: David Cook <dcook@prosentient.com.au>
>Date: Fri, 18 Aug 2023 03:02:30 +0000
>Subject: [PATCH] Bug 34570: Remove use of "onclick" for PopupMARCFieldDoc()
>Content-Type: text/plain; charset=utf-8
>
>This change removes the "onclick" attribute for the MARC doc
>link in the cataloguing editor.
>
>Test plan:
>0. Apply patch
>1. Go to http://localhost:8081/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=#
>2. Click on the question mark (?) next to any of the MARC fields
>3. Press the "Repeat this tag" button
>4. Click on the question mark (?) on the cloned MARC field
>5. Note that both times it worked
>
>Signed-off-by: Owen Leonard <oleonard@myacpl.org>
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>---
> .../prog/en/modules/cataloguing/addbiblio.tt          | 11 +++++++++--
> 1 file changed, 9 insertions(+), 2 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
>index 1c1e7db0a3..7e88dd9d7c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
>@@ -435,7 +435,8 @@ function AutomaticLinker() {
> }
> 
> 
>-function PopupMARCFieldDoc(field) {
>+function PopupMARCFieldDoc() {
>+    let field = this.dataset.tag;
>     [% IF Koha.Preference('marcfielddocurl') %]
>         var docurl = "[% Koha.Preference('marcfielddocurl').replace('"','&quot;') | html %]";
>         docurl = docurl.replace("{MARC}", "[% marcflavour | html %]");
>@@ -447,7 +448,13 @@ function PopupMARCFieldDoc(field) {
>     [% ELSIF ( marcflavour == 'UNIMARC' ) %]
>         _UNIMARCFieldDoc(field);
>     [% END %]
>+    return false;
> }
>+[%# Attach to body, so that cloned nodes will still have the event listener %]
>+$(document).ready(function(){
>+    $('body').on('click','.marcdocs',PopupMARCFieldDoc);
>+});
>+
>     function confirmnotdup(redirect){
>         $("#confirm_not_duplicate").attr("value","1");
>         $("#redirect").attr("value",redirect);
>@@ -1040,7 +1047,7 @@ function PopupMARCFieldDoc(field) {
>                                                     <a href="#" tabindex="1" class="tagnum" title="[% innerloo.tag_lib | html %] - Click to expand this tag" onclick="ExpandField('tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]'); return false;">[% innerloo.tag | html %]</a>
>                                                 [% ELSE %]
>                                                     <span class="tagnum" title="[% innerloo.tag_lib | html %]">[% innerloo.tag | html %]</span>
>-                                                    <a href="#" class="marcdocs" onclick="PopupMARCFieldDoc('[% innerloo.tag | html %]'); return false;">&nbsp;?</a>
>+                                                    <a href="#" class="marcdocs" data-tag="[% innerloo.tag | html %]">&nbsp;?</a>
>                                                 [% END %]
> 
>                                                 [% IF ( innerloo.fixedfield ) %]
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 34570: 154583 | 154585 | 154792