Attachment #38068 for bug #7380

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





        <p>
            <label for="branchcode">Library: </label>
            [% SET branches = Branches.all( selected => branchcode_filter ) %]
            <select name="branchcode_filter" id="branchcode">
                [% IF branches.size != 1 %]
                  <option value="">Any</option>
                [% END %]


        <p>
            <label for="categorycode">Category: </label>
            [% SET categories = Categories.all( selected => categorycode_filter ) %]
            <select name="categorycode_filter" id="categorycode">
                <option value="">Any</option>
                [% FOREACH categorie IN categories %]
                    [% IF ( categorie.selected ) %]




        $("#searchtype_filter").val("[% searchtype %]");
    [% END %]
    [% IF categorycode %]
        $("#categorycode_filter").val("[% categorycode_filter %]");
    [% END %]
    [% IF branchcode %]
        $("#branchcode_filter").val("[% branchcode_filter %]");
    [% END %]

    [% IF view != "show_results" %]

            </li>
            <li>
              <label for="categorycode_filter">Category:</label>
              [% SET categories = Categories.all( selected => categorycode_filter ) %]
              <select id="categorycode_filter">
                <option value="">Any</option>
                [% FOREACH cat IN categories %]

            </li>
            <li>
              <label for="branchcode_filter">Library:</label>
              [% SET branches = Branches.all( selected => branchcode_filter ) %]
              <select id="branchcode_filter">
                [% IF branches.size != 1 %]
                  <option value="">Any</option>





my $theme = $input->param('theme') || "default";

my $patron = $input->Vars;
foreach (keys %$patron){
    delete $patron->{$_} unless($patron->{$_});
}

my $searchmember = $input->param('searchmember');
my $quicksearch = $input->param('quicksearch') // 0;


$template->param(
    patron_lists => [ GetPatronLists() ],
    searchmember        => $searchmember,
    branchcode_filter   => $input->param('branchcode_filter'),
    categorycode_filter => $input->param('categorycode_filter'),
    searchtype          => $input->param('searchtype') || 'start_with',
    searchfieldstype    => $searchfieldstype,
    PatronsPerPage      => C4::Context->preference("PatronsPerPage") || 20,
- 

Return to bug 7380

Lines 75-82 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc (-4 / +4 lines)
75		75
76	<p>	76	<p>
77	<label for="branchcode">Library: </label>	77	<label for="branchcode">Library: </label>
78	[% SET branches = Branches.all( selected => branchcode ) %]	78	[% SET branches = Branches.all( selected => branchcode_filter ) %]
79	<select name="branchcode" id="branchcode">	79	<select name="branchcode_filter" id="branchcode">
80	[% IF branches.size != 1 %]	80	[% IF branches.size != 1 %]
81	<option value="">Any</option>	81	<option value="">Any</option>
82	[% END %]	82	[% END %]
Lines 92-99 Link Here
92		92
93	<p>	93	<p>
94	<label for="categorycode">Category: </label>	94	<label for="categorycode">Category: </label>
95	[% SET categories = Categories.all( selected => categorycode ) %]	95	[% SET categories = Categories.all( selected => categorycode_filter ) %]
96	<select name="categorycode" id="categorycode">	96	<select name="categorycode_filter" id="categorycode">
97	<option value="">Any</option>	97	<option value="">Any</option>
98	[% FOREACH categorie IN categories %]	98	[% FOREACH categorie IN categories %]
99	[% IF ( categorie.selected ) %]	99	[% IF ( categorie.selected ) %]

Lines 98-107 $(document).ready(function() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt (-4 / +4 lines)
98	$("#searchtype_filter").val("[% searchtype %]");	98	$("#searchtype_filter").val("[% searchtype %]");
99	[% END %]	99	[% END %]
100	[% IF categorycode %]	100	[% IF categorycode %]
101	$("#categorycode_filter").val("[% categorycode %]");	101	$("#categorycode_filter").val("[% categorycode_filter %]");
102	[% END %]	102	[% END %]
103	[% IF branchcode %]	103	[% IF branchcode %]
104	$("#branchcode_filter").val("[% branchcode %]");	104	$("#branchcode_filter").val("[% branchcode_filter %]");
105	[% END %]	105	[% END %]
106		106
107	[% IF view != "show_results" %]	107	[% IF view != "show_results" %]
Lines 454-460 function filterByFirstLetterSurname(letter) { Link Here
454	</li>	454	</li>
455	<li>	455	<li>
456	<label for="categorycode_filter">Category:</label>	456	<label for="categorycode_filter">Category:</label>
457	[% SET categories = Categories.all( selected => categorycode ) %]	457	[% SET categories = Categories.all( selected => categorycode_filter ) %]
458	<select id="categorycode_filter">	458	<select id="categorycode_filter">
459	<option value="">Any</option>	459	<option value="">Any</option>
460	[% FOREACH cat IN categories %]	460	[% FOREACH cat IN categories %]
Lines 468-474 function filterByFirstLetterSurname(letter) { Link Here
468	</li>	468	</li>
469	<li>	469	<li>
470	<label for="branchcode_filter">Library:</label>	470	<label for="branchcode_filter">Library:</label>
471	[% SET branches = Branches.all( selected => branchcode ) %]	471	[% SET branches = Branches.all( selected => branchcode_filter ) %]
472	<select id="branchcode_filter">	472	<select id="branchcode_filter">
473	[% IF branches.size != 1 %]	473	[% IF branches.size != 1 %]
474	<option value="">Any</option>	474	<option value="">Any</option>

Lines 45-55 my ($template, $loggedinuser, $cookie) Link Here

(-)a/members/member.pl (-8 / +2 lines)
45		45
46	my $theme = $input->param('theme') \|\| "default";	46	my $theme = $input->param('theme') \|\| "default";
47		47
48	my $patron = $input->Vars;
49	foreach (keys %$patron){
50	delete $patron->{$_} unless($patron->{$_});
51	}
52
53	my $searchmember = $input->param('searchmember');	48	my $searchmember = $input->param('searchmember');
54	my $quicksearch = $input->param('quicksearch') // 0;	49	my $quicksearch = $input->param('quicksearch') // 0;
55		50
Lines 82-89 my $view = $input->request_method() eq "GET" ? "show_form" : "show_results"; Link Here
82	$template->param(	77	$template->param(
83	patron_lists => [ GetPatronLists() ],	78	patron_lists => [ GetPatronLists() ],
84	searchmember => $searchmember,	79	searchmember => $searchmember,
85	branchcode => $patron->{branchcode},	80	branchcode_filter => $input->param('branchcode_filter'),
86	categorycode => $patron->{categorycode},	81	categorycode_filter => $input->param('categorycode_filter'),
87	searchtype => $input->param('searchtype') \|\| 'start_with',	82	searchtype => $input->param('searchtype') \|\| 'start_with',
88	searchfieldstype => $searchfieldstype,	83	searchfieldstype => $searchfieldstype,
89	PatronsPerPage => C4::Context->preference("PatronsPerPage") \|\| 20,	84	PatronsPerPage => C4::Context->preference("PatronsPerPage") \|\| 20,
90	-