View | Details | Raw Unified | Return to bug 17153
Collapse All | Expand All

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc (+1 lines)
Lines 301-306 Link Here
301
            <h3 id="modalLoginLabel">Log in to your account</h3>
301
            <h3 id="modalLoginLabel">Log in to your account</h3>
302
        </div>
302
        </div>
303
        <form action="/cgi-bin/koha/opac-user.pl" method="post" name="auth" id="modalAuth">
303
        <form action="/cgi-bin/koha/opac-user.pl" method="post" name="auth" id="modalAuth">
304
            <input type="hidden" name="has-search-query" id="has-search-query" value="" />
304
            <div class="modal-body">
305
            <div class="modal-body">
305
                [% IF ( shibbolethAuthentication ) %]
306
                [% IF ( shibbolethAuthentication ) %]
306
                    [% IF ( invalidShibLogin ) %]
307
                    [% IF ( invalidShibLogin ) %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt (+1 lines)
Lines 594-599 Link Here
594
[% IF ( OpacStarRatings == 'all' || Koha.Preference('Babeltheque') ) %][% Asset.js("lib/jquery/plugins/jquery.rating.js") %][% END %]
594
[% IF ( OpacStarRatings == 'all' || Koha.Preference('Babeltheque') ) %][% Asset.js("lib/jquery/plugins/jquery.rating.js") %][% END %]
595
[% IF ( OverDriveEnabled ) %][% Asset.js("js/overdrive.js") %][% END %]
595
[% IF ( OverDriveEnabled ) %][% Asset.js("js/overdrive.js") %][% END %]
596
[% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %]
596
[% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %]
597
[% Asset.js("js/authtoresults.js") %]
597
[% IF ( OpacHighlightedWords ) %][% Asset.js("lib/jquery/plugins/jquery.highlight-3.js") %]
598
[% IF ( OpacHighlightedWords ) %][% Asset.js("lib/jquery/plugins/jquery.highlight-3.js") %]
598
[% END %]<script>
599
[% END %]<script>
599
//<![CDATA[
600
//<![CDATA[
(-)a/koha-tmpl/opac-tmpl/bootstrap/js/authtoresults.js (+10 lines)
Line 0 Link Here
1
if (window.location.href.indexOf("opac-search.pl") > -1) {
2
3
    // extract search params
4
    var searchUrl = location.href;
5
    var searchParams = searchUrl.substring(searchUrl.indexOf("?")+1);
6
7
    // store search params in loginModal to pass back on redirect
8
    var query = document.getElementById("has-search-query");
9
    query.value = searchParams;
10
}
(-)a/opac/opac-user.pl (-1 / +12 lines)
Lines 362-365 $template->param( Link Here
362
    failed_holds             => scalar $query->param('failed_holds'),
362
    failed_holds             => scalar $query->param('failed_holds'),
363
);
363
);
364
364
365
# if not an empty string this indicates to return
366
# back to the opac-results page
367
my $search_query = $query->param('has-search-query');
368
369
if ($search_query ne '') {
370
371
    print $query->redirect(
372
        -uri    => "/cgi-bin/koha/opac-search.pl?$search_query",
373
        -cookie => $cookie,
374
    );
375
}
376
365
output_html_with_http_headers $query, $cookie, $template->output, undef, { force_no_caching => 1 };
377
output_html_with_http_headers $query, $cookie, $template->output, undef, { force_no_caching => 1 };
366
- 

Return to bug 17153