Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 32125: Select correct tab on return

Browse source 
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>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 32258f82b5)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
This commit is contained in:
Martin Renvoize 2022-11-07 16:44:29 +00:00 committed by Jacob O'Mara
parent cc253e255c
commit fd4950b949
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
View file

@ -880,7 +880,7 @@
[% END %]
[% ELSE %]
<div id="addcomment">
<a class="login-link loginModal-trigger" role="button" data-toggle="modal" data-return="true" href="/cgi-bin/koha/opac-user.pl">Log in to your account</a> to post a comment.
<a class="login-link loginModal-trigger" role="button" data-toggle="modal" data-return="true" data-tab="comment" href="/cgi-bin/koha/opac-user.pl">Log in to your account</a> to post a comment.
</div>
[% END # / IF loggedinusername %]
</div> <!-- / #comments -->
@ -1705,6 +1705,14 @@
showBsTab("bibliodescriptions", "holdings");
[% END -%]
let urlParams = new URLSearchParams(window.location.search);
if ( urlParams.has('tab') ) {
let tab = urlParams.get('tab');
if ( tab == 'comment' ) {
showBsTab("bibliodescriptions", "comments");
}
}
[% IF ( Koha.Preference('OpacBrowseResults') && busc ) %]
$(".l_Results").show();
$("#a_listResults").on("click", function(e){

9
koha-tmpl/opac-tmpl/bootstrap/js/global.js
View file

@ -228,7 +228,14 @@ $(document).ready(function(){
var button = $(this);
var context = button.data('return');
if ( context ) {
$('#modalAuth').append('<input type="hidden" name="return" value="'+window.location.pathname+window.location.search+'" />');
let return_url = window.location.pathname;
let params = window.location.search;
var tab = button.data('tab');
if ( tab ) {
params = params ? params + '&tab=' + tab : '?tab=' + tab;
}
return_url += params;
$('#modalAuth').append('<input type="hidden" name="return" value="'+return_url+'" />');
}
$("#loginModal").modal("show");
});