Attachment 110555 Details for Bug 11299 – Bug 11299: (follow-up) Correct rebase errors and add message class to dialog

[patch] Bug 11299: (follow-up) Correct rebase errors and add message class to dialog

Bug-11299-follow-up-Correct-rebase-errors-and-add-.patch (text/plain), 3.62 KB, created by Nick Clemens (kidclamp) on 2020-09-22 13:42:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nick Clemens (kidclamp)

Created: 2020-09-22 13:42:27 UTC

Size: 3.62 KB

patch

obsolete

>From d49b03daf4bcac77962869f8f30818baa4df6693 Mon Sep 17 00:00:00 2001
>From: Nick Clemens <nick@bywatersolutions.com>
>Date: Tue, 25 Aug 2020 10:56:51 +0000
>Subject: [PATCH] Bug 11299: (follow-up) Correct rebase errors and add message
> class to dialog
>
>---
> .../prog/en/modules/authorities/authorities.tt     |  4 ++--
> .../prog/en/modules/cataloguing/addbiblio.tt       | 25 ++--------------------
> 2 files changed, 4 insertions(+), 25 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
>index ed34c91b91..6e55762e06 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
>@@ -212,9 +212,9 @@ function confirmnotdup(redirect){
>     <input type="hidden" name="op" value="add" />
>     <input type="hidden" name="addfield_field" value="" />
>     <input type="hidden" name="repeat_field" value="" />
>-    <input type="hidden" name="authtypecode" value="[% authtypecode  | html%]" />
>+    <input type="hidden" name="authtypecode" value="[% authtypecode | html%]" />
>     <input type="hidden" name="authid" value="[% authid | html %]" />
>-    <input type="hidden" name="index" value="[% index | html  %]" />
>+    <input type="hidden" name="index" value="[% index | html %]" />
>     <input type="hidden" value="0" id="confirm_not_duplicate" name="confirm_not_duplicate" />
> 
>     <div id="toolbar" class="btn-toolbar">
>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 7e175eb450..ef3ac7a852 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
>@@ -183,27 +183,6 @@
>         }
> [% END %]
> 
>-function confirmnotdup(redirect){
>-    $("#confirm_not_duplicate").attr("value","1");
>-    $("#redirect").attr("value",redirect);
>-    Check();
>-}
>-
>-function Dopop(link,i) {
>-    defaultvalue = document.getElementById(i).value;
>-    window.open(link+"&result="+defaultvalue,"valuebuilder",'width=700,height=550,toolbar=false,scrollbars=yes');
>-}
>-
>-/**
>- * this function open a popup to search on z3950 server.
>- */
>-function PopupZ3950() {
>-    var strQuery = GetZ3950Terms();
>-    if(strQuery){
>-        window.open("/cgi-bin/koha/cataloguing/z3950_search.pl?biblionumber=[% biblionumber | html %]"+strQuery,"z3950search",'width=740,height=450,location=yes,toolbar=no,scrollbars=yes,resize=yes');
>-    }
>-}
>-
> /**
> * this function append button for create new authority if not found
> */
>@@ -221,7 +200,7 @@ function addCreateAuthorityButton(tag_subfield_line, heading, tag_index) {
>             // Create a new form that will be POSTed in the new window
>             var form = $('<form>').attr({
>             method: 'post',
>-            action: "../authorities/authorities.pl",
>+            action: "/cgi-bin/authorities/authorities.pl",
>             target: "new_auth_popup"
>             });
>             //add the authtypecode
>@@ -272,7 +251,7 @@ function updateHeadingLinks(links) {
> 
>     // Delete the old message dialog and create a new one
>     $('#autolinker_dialog').remove();
>-    var message_dialog = $('<div id="autolinker_dialog" class="dialog"><strong>' + _("Automatic authority link results:") + '</strong><ul></ul></div>');
>+    var message_dialog = $('<div id="autolinker_dialog" class="dialog message"><strong>' + _("Automatic authority link results:") + '</strong><ul></ul></div>');
>     var message_dialog_ul = message_dialog.find('ul');
> 
>     $.each(links, function(index, heading) {
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 11299: 23146 | 26715 | 33074 | 37912 | 37913 | 37972 | 38737 | 39477 | 39478 | 39479 | 40831 | 41229 | 45218 | 56440 | 56508 | 56509 | 58307 | 60998 | 63311 | 63312 | 63313 | 64075 | 67162 | 67708 | 67709 | 67710 | 67712 | 67713 | 67714 | 67824 | 67825 | 67826 | 67827 | 67828 | 67829 | 79385 | 79386 | 79387 | 79388 | 79389 | 79390 | 79391 | 79392 | 79393 | 79394 | 79395 | 79396 | 79397 | 79398 | 79399 | 79447 | 79448 | 79449 | 79450 | 79451 | 79452 | 79545 | 94818 | 95126 | 95152 | 98571 | 98572 | 99249 | 108091 | 108309 | 108310 | 108396 | 108552 | 108834 | 108835 | 109062 | 109063 | 109069 | 109181 | 110553 | 110554 | 110555 | 110556 | 110557 | 110568 | 110569 | 110570 | 110571 | 110572 | 111706 | 111707 | 111708 | 111709 | 111710 | 112125 | 112126 | 112127 | 112128 | 112129 | 112130 | 112131 | 112132 | 112133 | 112134 | 112135 | 113562 | 113563 | 113564 | 113565 | 113566 | 113567 | 113568 | 114803 | 114924 | 114925 | 114926 | 114927 | 114928 | 114929 | 114930 | 114931 | 114932