Attachment 151365 Details for Bug 30979 – Bug 30979: Add modal trigger to shibboleth target url

[patch] Bug 30979: Add modal trigger to shibboleth target url

Bug-30979-Add-modal-trigger-to-shibboleth-target-u.patch (text/plain), 2.11 KB, created by Martin Renvoize (ashimema) on 2023-05-17 17:12:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2023-05-17 17:12:33 UTC

Size: 2.11 KB

patch

obsolete

>From a26bade1a01d2f1873a2d4c724faaf68896172a2 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Mon, 20 Feb 2023 17:02:05 +0000
>Subject: [PATCH] Bug 30979: Add modal trigger to shibboleth target url
>
>Signed-off-by: Silvia Meakins <smeakins@eso.org>
>Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
>---
> koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc | 2 +-
> koha-tmpl/opac-tmpl/bootstrap/js/modals/checkout.js    | 3 +++
> 2 files changed, 4 insertions(+), 1 deletion(-)
>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
>index 685d72b499..0abc71fc86 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
>@@ -385,7 +385,7 @@
>                                 </div>
>                             [% ELSE %]
>                                 <h3>Shibboleth login</h3>
>-                                <p><a href="[% shibbolethLoginUrl | $raw %]">Log in using a Shibboleth account</a>.</p>
>+                                <p><a id="shib_url" href="[% shibbolethLoginUrl | $raw %]">Log in using a Shibboleth account</a>.</p>
>                                 [% UNLESS Koha.Preference('opacShibOnly') %]
>                                     <h3>Local login</h3>
>                                 [% END %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/js/modals/checkout.js b/koha-tmpl/opac-tmpl/bootstrap/js/modals/checkout.js
>index f846a1bf57..1243ee67c8 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/js/modals/checkout.js
>+++ b/koha-tmpl/opac-tmpl/bootstrap/js/modals/checkout.js
>@@ -68,6 +68,9 @@ $(document).ready(function() {
>            let url = new URL(window.location.href);
>            url.searchParams.append('modal','checkout');
>            $('#modalAuth').append('<input type="hidden" name="return" value="' + url.href +'" />');
>+           $('#shib_login').each(function(){
>+               this.url = this.url.replace(/target=(.*)/, "target=" + url.href);
>+           });
>            $('#loginModal').modal('show');
>            return false;
>        }
>-- 
>2.40.1

Actions: View | Diff | Splinter Review

Attachments on bug 30979: 139131 | 139132 | 139133 | 139134 | 141274 | 141275 | 141276 | 141277 | 141278 | 141279 | 141300 | 145264 | 145265 | 145266 | 145267 | 145268 | 145277 | 145280 | 145281 | 145282 | 145283 | 145284 | 145285 | 145620 | 145621 | 145622 | 145623 | 145624 | 145625 | 145626 | 145627 | 145628 | 145629 | 145630 | 150867 | 150868 | 150869 | 150870 | 150871 | 150872 | 150873 | 150874 | 150875 | 150876 | 150877 | 150878 | 150879 | 150880 | 150881 | 150882 | 150883 | 150884 | 150885 | 150886 | 150887 | 150888 | 150889 | 150967 | 150968 | 150969 | 150970 | 150971 | 150972 | 150973 | 150974 | 151254 | 151255 | 151256 | 151257 | 151258 | 151259 | 151260 | 151261 | 151358 | 151359 | 151360 | 151361 | 151362 | 151363 | 151364 | 151365 | 151368 | 151369 | 151370 | 151371 | 151372 | 151373 | 151374 | 151375 | 151376 | 152789 | 152790 | 152791 | 152792 | 152793 | 152794 | 152795 | 152796 | 152797 | 153459 | 153460 | 153461 | 153462 | 153463 | 153464 | 153465 | 153466 | 153467 | 153500 | 153501 | 153502 | 153503