Attachment #157745 for bug #35127

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

Lines 4-10 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-search-box.inc (-1 / +1 lines)
4	[% USE Koha %]	4	[% USE Koha %]
5	[% PROCESS 'patronfields.inc' %]	5	[% PROCESS 'patronfields.inc' %]
6	[% IF CAN_user_borrowers_edit_borrowers %]	6	[% IF CAN_user_borrowers_edit_borrowers %]
7	[%- SET searchtype = Koha.Preference('DefaultPatronSearchMethod') -%]	7	[%- SET searchtype = searchtype \|\| Koha.Preference('DefaultPatronSearchMethod') -%]
8	[% IF( bs_tab_active ) %]	8	[% IF( bs_tab_active ) %]
9	<div id="patron_search" role="tabpanel" class="tab-pane active">	9	<div id="patron_search" role="tabpanel" class="tab-pane active">
10	[% ELSE %]	10	[% ELSE %]




[%# - sort2: select patron sort2 field %]
[%# - search_field: select patron field list %]
[%# - search_type: select 'contains' or 'starts with' %]
[%- searchtype = searchtype || Koha.Preference('DefaultPatronSearchMethod') -%]
[% BLOCK patron_search_filters %]
    <form id="patron_search_form">
        <fieldset class="brief">

                "-and": function(){
                    let filters = [];

                    let search_type = $("#searchtype_filter").val();
                    let search_fields = $("#searchfieldstype_filter").val() || "standard";
                    let pattern = $("#search_patron_filter").val();



        function clearFilters() {
            $("#searchfieldstype_filter option:first").prop("selected", true);
            $("#searchtype_filter option[value='[% searchtype | html %]']").prop("selected", true);
            $("#categorycode_filter option:first").prop("selected", true);
            $("#branchcode_filter option:first").prop("selected", true);
            $("#sort1_filter").val('').trigger("change");

Lines 11-17 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt (-1 / +1 lines)
11	[% SET libraries = Branches.all %]	11	[% SET libraries = Branches.all %]
12	[% SET categories = Categories.all.unblessed %]	12	[% SET categories = Categories.all.unblessed %]
13	[% SET columns = ['cardnumber', 'name-address', 'dateofbirth', 'branch', 'category', 'dateexpiry', 'checkouts', 'account_balance', 'borrowernotes', 'action'] %]	13	[% SET columns = ['cardnumber', 'name-address', 'dateofbirth', 'branch', 'category', 'dateexpiry', 'checkouts', 'account_balance', 'borrowernotes', 'action'] %]
14	[% SET searchtype = Koha.Preference('DefaultPatronSearchMethod') %]	14	[% SET searchtype = searchtype \|\| Koha.Preference('DefaultPatronSearchMethod') %]
15	[% PROCESS 'patron-search.inc' %]	15	[% PROCESS 'patron-search.inc' %]
16	[% INCLUDE 'doc-head-open.inc' %]	16	[% INCLUDE 'doc-head-open.inc' %]
17	<title>[% FILTER collapse %]	17	<title>[% FILTER collapse %]

Lines 65-70 if ( $quicksearch and $searchmember && !$circsearch ) { Link Here

(-)a/members/member.pl (-1 / +2 lines)
65	}	65	}
66		66
67	my $searchfieldstype = $input->param('searchfieldstype') \|\| 'standard';	67	my $searchfieldstype = $input->param('searchfieldstype') \|\| 'standard';
		68	my $searchtype = $input->param('searchtype');
68		69
69	$template->param( 'alphabet' => C4::Context->preference('alphabet') \|\| join ' ', 'A' .. 'Z' );	70	$template->param( 'alphabet' => C4::Context->preference('alphabet') \|\| join ' ', 'A' .. 'Z' );
70		71
Lines 75-80 $template->param( Link Here
75	searchmember => $searchmember,	76	searchmember => $searchmember,
76	branchcode_filter => scalar $input->param('branchcode_filter'),	77	branchcode_filter => scalar $input->param('branchcode_filter'),
77	categorycode_filter => scalar $input->param('categorycode_filter'),	78	categorycode_filter => scalar $input->param('categorycode_filter'),
		79	searchtype => $searchtype,
78	searchfieldstype => $searchfieldstype,	80	searchfieldstype => $searchfieldstype,
79	PatronsPerPage => C4::Context->preference("PatronsPerPage") \|\| 20,	81	PatronsPerPage => C4::Context->preference("PatronsPerPage") \|\| 20,
80	do_not_defer_loading => !$defer_loading,	82	do_not_defer_loading => !$defer_loading,
81	-

Return to bug 35127

Lines 23-29 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc (-3 / +3 lines)
23	[%# - sort2: select patron sort2 field %]	23	[%# - sort2: select patron sort2 field %]
24	[%# - search_field: select patron field list %]	24	[%# - search_field: select patron field list %]
25	[%# - search_type: select 'contains' or 'starts with' %]	25	[%# - search_type: select 'contains' or 'starts with' %]
26	[%- SET searchtype = Koha.Preference('DefaultPatronSearchMethod') -%]	26	[%- searchtype = searchtype \|\| Koha.Preference('DefaultPatronSearchMethod') -%]
27	[% BLOCK patron_search_filters %]	27	[% BLOCK patron_search_filters %]
28	<form id="patron_search_form">	28	<form id="patron_search_form">
29	<fieldset class="brief">	29	<fieldset class="brief">
Lines 318-324 Link Here
318	"-and": function(){	318	"-and": function(){
319	let filters = [];	319	let filters = [];
320		320
321	let search_type = $("#searchtype_filter").val() \|\| "contains";	321	let search_type = $("#searchtype_filter").val();
322	let search_fields = $("#searchfieldstype_filter").val() \|\| "standard";	322	let search_fields = $("#searchfieldstype_filter").val() \|\| "standard";
323	let pattern = $("#search_patron_filter").val();	323	let pattern = $("#search_patron_filter").val();
324		324
Lines 817-823 Link Here
817		817
818	function clearFilters() {	818	function clearFilters() {
819	$("#searchfieldstype_filter option:first").prop("selected", true);	819	$("#searchfieldstype_filter option:first").prop("selected", true);
820	$("#searchtype_filter option[value='[% searchtype \|\| 'contains' \| html %]']").prop("selected", true);	820	$("#searchtype_filter option[value='[% searchtype \| html %]']").prop("selected", true);
821	$("#categorycode_filter option:first").prop("selected", true);	821	$("#categorycode_filter option:first").prop("selected", true);
822	$("#branchcode_filter option:first").prop("selected", true);	822	$("#branchcode_filter option:first").prop("selected", true);
823	$("#sort1_filter").val('').trigger("change");	823	$("#sort1_filter").val('').trigger("change");