Attachment 145620 Details for Bug 30979 – Bug 31699: Add 'return' option to opac modal login

[patch] Bug 31699: Add 'return' option to opac modal login

Bug-31699-Add-return-option-to-opac-modal-login.patch (text/plain), 2.01 KB, created by Martin Renvoize (ashimema) on 2023-01-24 15:30:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2023-01-24 15:30:15 UTC

Size: 2.01 KB

patch

obsolete

>From 8043eaaacf0f746e5815924b365da9a98149861f Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Thu, 6 Oct 2022 14:38:42 +0100
>Subject: [PATCH] Bug 31699: Add 'return' option to opac modal login
>
>This patch adds the option to trigger a redirect back to the current
>context after successful login using modal logins triggered from various
>places in the OPAC.
>
>To make use of this, simply add 'data-return="true"' to the modal trigger link.
>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Signed-off-by: David Nind <david@davidnind.com>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> koha-tmpl/opac-tmpl/bootstrap/js/global.js |  5 +++++
> opac/opac-user.pl                          | 10 ++++++++++
> 2 files changed, 15 insertions(+)
>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/js/global.js b/koha-tmpl/opac-tmpl/bootstrap/js/global.js
>index 6f5ae95c3fa..27fe084755e 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/js/global.js
>+++ b/koha-tmpl/opac-tmpl/bootstrap/js/global.js
>@@ -225,6 +225,11 @@ $(document).ready(function(){
> 
>     $(".loginModal-trigger").on("click",function(e){
>         e.preventDefault();
>+        var button = $(this);
>+        var context = button.data('return');
>+        if ( context ) {
>+            $('#modalAuth').append('<input type="hidden" name="return" value="'+window.location+'" />');
>+        }
>         $("#loginModal").modal("show");
>     });
>     $("#loginModal").on("shown.bs.modal", function(){
>diff --git a/opac/opac-user.pl b/opac/opac-user.pl
>index ba45ddd2379..1b2aa815d29 100755
>--- a/opac/opac-user.pl
>+++ b/opac/opac-user.pl
>@@ -424,4 +424,14 @@ if ($search_query) {
>     );
> }
> 
>+# if not an empty string this indicates to return
>+# back to the page we triggered the login from
>+my $return = $query->param('return');
>+if ( $return ) {
>+    print $query->redirect(
>+        -uri    => $return,
>+        -cookie => $cookie,
>+    );
>+}
>+
> output_html_with_http_headers $query, $cookie, $template->output, undef, { force_no_caching => 1 };
>-- 
>2.39.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