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

(-)a/catalogue/search.pl (-7 / +17 lines)
Lines 277-283 if ( $template_type eq 'advsearch' ) { Link Here
277
        @operators = $cgi->multi_param('op');
277
        @operators = $cgi->multi_param('op');
278
        @indexes   = $cgi->multi_param('idx');
278
        @indexes   = $cgi->multi_param('idx');
279
        $template->param(
279
        $template->param(
280
            sort => scalar $cgi->param('sort_by'),
280
            sort                    => scalar $cgi->param('sort_by'),
281
            whole_record            => scalar $cgi->param('whole_record'),
282
            weight_search           => scalar $cgi->param('weight_search'),
283
            weight_search_submitted => scalar $cgi->param('weight_search_submitted'),
281
        );
284
        );
282
285
283
        # determine what to display next to the search boxes
286
        # determine what to display next to the search boxes
Lines 340-345 if ( $template_type eq 'advsearch' ) { Link Here
340
    {
343
    {
341
        $expanded = C4::Context->preference("expandedSearchOption") || 0
344
        $expanded = C4::Context->preference("expandedSearchOption") || 0
342
            if !defined($expanded) || $expanded !~ /^0|1$/;
345
            if !defined($expanded) || $expanded !~ /^0|1$/;
346
        $expanded = 1
347
            if ( $cgi->param('whole_record')
348
            || $cgi->param('weight_search')
349
            || $cgi->param('weight_search_submitted') );
343
        $template->param( expanded_options => $expanded );
350
        $template->param( expanded_options => $expanded );
344
    }
351
    }
345
352
Lines 740-751 $template->param( Link Here
740
$template->param(
747
$template->param(
741
748
742
    #classlist => $classlist,
749
    #classlist => $classlist,
743
    total             => $total,
750
    total                   => $total,
744
    opacfacets        => 1,
751
    opacfacets              => 1,
745
    facets_loop       => $facets,
752
    facets_loop             => $facets,
746
    displayFacetCount => C4::Context->preference('displayFacetCount') || 0,
753
    displayFacetCount       => C4::Context->preference('displayFacetCount') || 0,
747
    scan              => $scan,
754
    scan                    => $scan,
748
    search_error      => $error,
755
    search_error            => $error,
756
    weight_search           => $weight_search,
757
    weight_search_submitted => $params->{'weight_search_submitted'},
758
    whole_record            => $whole_record,
749
);
759
);
750
760
751
if ( $query_desc || $limit_desc ) {
761
if ( $query_desc || $limit_desc ) {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt (-2 / +2 lines)
Lines 153-163 Link Here
153
                    [% IF ( expanded_options ) %]
153
                    [% IF ( expanded_options ) %]
154
                        <p>
154
                        <p>
155
                            [% IF Koha.Preference('ElasticsearchMARCFormat') == 'ARRAY' %]
155
                            [% IF Koha.Preference('ElasticsearchMARCFormat') == 'ARRAY' %]
156
                                <label><input type="checkbox" name="whole_record" /> Search entire MARC record</label>
156
                                <label><input type="checkbox" name="whole_record" [% IF whole_record %]checked="checked"[% END %] /> Search entire MARC record</label>
157
                            [% END %]
157
                            [% END %]
158
                            <span id="weight_search">
158
                            <span id="weight_search">
159
                                <input type="hidden" name="weight_search_submitted" value="1" />
159
                                <input type="hidden" name="weight_search_submitted" value="1" />
160
                                <label><input type="checkbox" name="weight_search" checked="checked" /> Apply field weights to search</label>
160
                                <label><input type="checkbox" name="weight_search" [% IF weight_search_submitted %][% IF weight_search %]checked="checked"[% END %][% ELSE %]checked="checked"[% END %] /> Apply field weights to search</label>
161
                            </span>
161
                            </span>
162
                        </p>
162
                        </p>
163
                    [% ELSE %]
163
                    [% ELSE %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt (-1 / +1 lines)
Lines 153-159 Link Here
153
                                        <div id="weight_search">
153
                                        <div id="weight_search">
154
                                            <input type="hidden" name="weight_search_submitted" value="1" />
154
                                            <input type="hidden" name="weight_search_submitted" value="1" />
155
                                            <label>
155
                                            <label>
156
                                                <input type="checkbox" name="weight_search" checked="checked" />
156
                                                <input type="checkbox" name="weight_search" [% IF weight_search_submitted %][% IF weight_search %]checked="checked"[% END %][% ELSE %]checked="checked"[% END %] />
157
                                                Apply field weights to search
157
                                                Apply field weights to search
158
                                            </label>
158
                                            </label>
159
                                        </div>
159
                                        </div>
(-)a/opac/opac-search.pl (-2 / +1 lines)
Lines 527-533 if ( C4::Context->preference('OpacSuppression') ) { Link Here
527
    {
527
    {
528
        suppress                => $suppress,
528
        suppress                => $suppress,
529
        is_opac                 => 1,
529
        is_opac                 => 1,
530
        weighted_fields         => $weight_search,
530
        weight_search           => $weight_search,
531
        weight_search_submitted => $cgi->param('weight_search_submitted')
531
        weight_search_submitted => $cgi->param('weight_search_submitted')
532
    }
532
    }
533
    );
533
    );
534
- 

Return to bug 40968