Attachment #93558 for bug #23475

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

Lines 88-93 if ( not defined $record ) { Link Here

(-)a/catalogue/detail.pl (+9 lines)
88	exit;	88	exit;
89	}	89	}
90		90
		91	if( $query->param('found1') ){
		92	if($query->cookie("pulldown_selection")){
		93	my $ms = "ms_".$query->cookie("pulldown_selection");
		94	$template->param( $ms => 1);
		95	}
		96	if($query->cookie("searchbox_value")){
		97	$template->param( ms_value => $query->cookie("searchbox_value") );
		98	}
		99	}
91	if($query->cookie("holdfor")){	100	if($query->cookie("holdfor")){
92	my $holdfor_patron = Koha::Patrons->find( $query->cookie("holdfor") );	101	my $holdfor_patron = Koha::Patrons->find( $query->cookie("holdfor") );
93	$template->param(	102	$template->param(




            my $defaultview = C4::Context->preference('IntranetBiblioDefaultView');
            my $views = { C4::Search::enabled_staff_search_views };
            if ($defaultview eq 'isbd' && $views->{can_view_ISBD}) {
                print $cgi->redirect("/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=$biblionumber&found1=1");
            } elsif  ($defaultview eq 'marc' && $views->{can_view_MARC}) {
                print $cgi->redirect("/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=$biblionumber&found1=1");
            } elsif  ($defaultview eq 'labeled_marc' && $views->{can_view_labeledMARC}) {
                print $cgi->redirect("/cgi-bin/koha/catalogue/labeledMARCdetail.pl?biblionumber=$biblionumber&found1=1");
            } else {
                print $cgi->redirect("/cgi-bin/koha/catalogue/detail.pl?biblionumber=$biblionumber&found1=1");
            } 
            exit;
        }




    setContextBiblioNumbers( new Array() );
}

function saveOrClearSimpleSearchParams() {
    // Simple masthead search - pass value for display on details page
    $.cookie('pulldown_selection', $("#cat-search-block select.advsearch").val() );
    $.cookie('searchbox_value', $("#cat-search-block #search-form").val() );
}

$(document).ready(function(){
    // forms with action leading to search
    $("form[action*='search.pl']").submit(function(){
        resetSearchContext();
        saveOrClearSimpleSearchParams();
    });
    // any link to launch a search except navigation links
    $("[href*='search.pl?']").not(".nav").not('.searchwithcontext').click(function(){
- 

Return to bug 23475

Lines 590-602 for (my $i=0;$i<@servers;$i++) { Link Here

(-)a/catalogue/search.pl (-4 / +4 lines)
590	my $defaultview = C4::Context->preference('IntranetBiblioDefaultView');	590	my $defaultview = C4::Context->preference('IntranetBiblioDefaultView');
591	my $views = { C4::Search::enabled_staff_search_views };	591	my $views = { C4::Search::enabled_staff_search_views };
592	if ($defaultview eq 'isbd' && $views->{can_view_ISBD}) {	592	if ($defaultview eq 'isbd' && $views->{can_view_ISBD}) {
593	print $cgi->redirect("/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=$biblionumber");	593	print $cgi->redirect("/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=$biblionumber&found1=1");
594	} elsif ($defaultview eq 'marc' && $views->{can_view_MARC}) {	594	} elsif ($defaultview eq 'marc' && $views->{can_view_MARC}) {
595	print $cgi->redirect("/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=$biblionumber");	595	print $cgi->redirect("/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=$biblionumber&found1=1");
596	} elsif ($defaultview eq 'labeled_marc' && $views->{can_view_labeledMARC}) {	596	} elsif ($defaultview eq 'labeled_marc' && $views->{can_view_labeledMARC}) {
597	print $cgi->redirect("/cgi-bin/koha/catalogue/labeledMARCdetail.pl?biblionumber=$biblionumber");	597	print $cgi->redirect("/cgi-bin/koha/catalogue/labeledMARCdetail.pl?biblionumber=$biblionumber&found1=1");
598	} else {	598	} else {
599	print $cgi->redirect("/cgi-bin/koha/catalogue/detail.pl?biblionumber=$biblionumber");	599	print $cgi->redirect("/cgi-bin/koha/catalogue/detail.pl?biblionumber=$biblionumber&found1=1");
600	}	600	}
601	exit;	601	exit;
602	}	602	}

Lines 57-66 function resetSearchContext() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/js/commons.js (-1 / +7 lines)
57	setContextBiblioNumbers( new Array() );	57	setContextBiblioNumbers( new Array() );
58	}	58	}
59		59
		60	function saveOrClearSimpleSearchParams() {
		61	// Simple masthead search - pass value for display on details page
		62	$.cookie('pulldown_selection', $("#cat-search-block select.advsearch").val() );
		63	$.cookie('searchbox_value', $("#cat-search-block #search-form").val() );
		64	}
		65
60	$(document).ready(function(){	66	$(document).ready(function(){
61	// forms with action leading to search	67	// forms with action leading to search
62	$("form[action*='search.pl']").submit(function(){	68	$("form[action*='search.pl']").submit(function(){
63	resetSearchContext();	69	resetSearchContext();
		70	saveOrClearSimpleSearchParams();
64	});	71	});
65	// any link to launch a search except navigation links	72	// any link to launch a search except navigation links
66	$("[href*='search.pl?']").not(".nav").not('.searchwithcontext').click(function(){	73	$("[href*='search.pl?']").not(".nav").not('.searchwithcontext').click(function(){
67	-