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

(-)a/installer/data/mysql/atomicupdate/bug_26247-add_RetainCatalogSearchTerms_syspref.pl (+12 lines)
Line 0 Link Here
1
use Modern::Perl;
2
3
return {
4
    bug_number => "26247",
5
    description => "Add new system preference RetainCatalogSearchTerms",
6
    up => sub {
7
        my ($args) = @_;
8
        my ($dbh, $out) = @$args{qw(dbh out)};
9
10
        $dbh->do(q{INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('RetainCatalogSearchTerms', '1', NULL, 'If enabled, searches entered into the catalog search bar will be retained', 'YesNo') });
11
    },
12
};
(-)a/installer/data/mysql/atomicupdate/bug_26247-add_RetainPatronsSearchTerms_syspref.pl (+12 lines)
Line 0 Link Here
1
use Modern::Perl;
2
3
return {
4
    bug_number => "26247",
5
    description => "Add new system preference RetainPatronsSearchTerms",
6
    up => sub {
7
        my ($args) = @_;
8
        my ($dbh, $out) = @$args{qw(dbh out)};
9
10
        $dbh->do(q{INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('RetainPatronSearchTerms', '1', NULL, 'If enabled, searches entered into the checkout and patrons search bars will be retained', 'YesNo') });
11
    },
12
};
(-)a/installer/data/mysql/mandatory/sysprefs.sql (+2 lines)
Lines 605-610 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
605
('RestrictionBlockRenewing','0',NULL,'If patron is restricted, should renewal be allowed or blocked','YesNo'),
605
('RestrictionBlockRenewing','0',NULL,'If patron is restricted, should renewal be allowed or blocked','YesNo'),
606
('OPACResultsMaxItems','1','','Maximum number of available items displayed in search results','Integer'),
606
('OPACResultsMaxItems','1','','Maximum number of available items displayed in search results','Integer'),
607
('OPACResultsMaxItemsUnavailable','0','','Maximum number of unavailable items displayed in search results','Integer'),
607
('OPACResultsMaxItemsUnavailable','0','','Maximum number of unavailable items displayed in search results','Integer'),
608
('RetainCatalogSearchTerms', '1', NULL, 'If enabled, searches entered into the catalog search bar will be retained', 'YesNo'),
609
('RetainPatronsSearchTerms', '1', NULL, 'If enabled, searches entered into the checkout and patrons search bar will be retained', 'YesNo'),
608
('ReturnBeforeExpiry','0',NULL,'If ON, checkout will be prevented if returndate is after patron card expiry','YesNo'),
610
('ReturnBeforeExpiry','0',NULL,'If ON, checkout will be prevented if returndate is after patron card expiry','YesNo'),
609
('ReturnLog','1',NULL,'If ON, enables the circulation (returns) log','YesNo'),
611
('ReturnLog','1',NULL,'If ON, enables the circulation (returns) log','YesNo'),
610
('ReturnpathDefault','',NULL,'Use this email address as return path or bounce address for undeliverable emails','Free'),
612
('ReturnpathDefault','',NULL,'Use this email address as return path or bounce address for undeliverable emails','Free'),
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue-search-box.inc (-5 / +8 lines)
Lines 3-12 Link Here
3
    <div id="catalog_search" class="residentsearch">
3
    <div id="catalog_search" class="residentsearch">
4
        <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
4
        <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
5
            <label class="tip" for="search-form">Enter search keywords:</label>
5
            <label class="tip" for="search-form">Enter search keywords:</label>
6
                [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
6
            [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
7
                    [% INCLUDE 'search_indexes.inc' $header_pulldown = 1 %]
7
                [% INCLUDE 'search_indexes.inc' $header_pulldown = 1 %]
8
                [% END %]
8
            [% END %]
9
            <input type="text" name="q" id="search-form" size="40" value="[% ms_value | html %]" title="Enter the terms you wish to search for." class="query form-text head-searchbox" />
9
            [% IF ( Koha.Preference('RetainCatalogSearchTerms') ) %]
10
                <input type="text" name="q" id="search-form" size="40" value="[% ms_value | html %]" title="Enter the terms you wish to search for." class="query form-text head-searchbox" />
11
            [% ELSE %]
12
                <input type="text" name="q" id="search-form" size="40" title="Enter the terms you wish to search for." class="query form-text head-searchbox" />
13
            [% END %]
10
            [% IF ( Koha.Preference('IntranetAddMastheadLibraryPulldown') ) %]
14
            [% IF ( Koha.Preference('IntranetAddMastheadLibraryPulldown') ) %]
11
                <select id="select_library" name="limit" style="margin-left:5px;">
15
                <select id="select_library" name="limit" style="margin-left:5px;">
12
                    <option value="">All libraries</option>
16
                    <option value="">All libraries</option>
Lines 14-20 Link Here
14
                </select>
18
                </select>
15
            [% END %]
19
            [% END %]
16
            <input type="submit" value="Submit"  class="submit" />
20
            <input type="submit" value="Submit"  class="submit" />
17
18
        </form>
21
        </form>
19
    </div>
22
    </div>
20
[% END %]
23
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-header.inc (+4 lines)
Lines 11-17 Link Here
11
    <form action="/cgi-bin/koha/members/member.pl" method="post">
11
    <form action="/cgi-bin/koha/members/member.pl" method="post">
12
        <label class="tip" for="searchmember">Enter patron card number or partial name:</label>
12
        <label class="tip" for="searchmember">Enter patron card number or partial name:</label>
13
    <div class="autocomplete">
13
    <div class="autocomplete">
14
        [% IF ( Koha.Preference('RetainPatronsSearchTerms') ) %]
14
        <input id="searchmember" data-toggle="tooltip" size="25" class="head-searchbox" name="searchmember" type="text" value="[% searchmember | html %]" autocomplete="off" />
15
        <input id="searchmember" data-toggle="tooltip" size="25" class="head-searchbox" name="searchmember" type="text" value="[% searchmember | html %]" autocomplete="off" />
16
        [% ELSE %]
17
        <input id="searchmember" data-toggle="tooltip" size="25" class="head-searchbox" name="searchmember" type="text" autocomplete="off" />
18
        [% END %]
15
        <input type="hidden" name="quicksearch" value="1" />
19
        <input type="hidden" name="quicksearch" value="1" />
16
        <span class="filteraction" id="filteraction_off"> <a href="#">[-]</a></span>
20
        <span class="filteraction" id="filteraction_off"> <a href="#">[-]</a></span>
17
        <span class="filteraction" id="filteraction_on"> <a href="#">[+]</a></span>
21
        <span class="filteraction" id="filteraction_on"> <a href="#">[+]</a></span>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref (-1 / +12 lines)
Lines 276-281 Searching: Link Here
276
                  1: "search"
276
                  1: "search"
277
                  0: "don't search"
277
                  0: "don't search"
278
            - on all variations of the ISSN.
278
            - on all variations of the ISSN.
279
        -
280
            - pref: RetainCatalogSearchTerms
281
              choices:
282
                  0: "Don't retain"
283
                  1: "Retain"
284
            - search terms between searches when searching from the 'search the catalog' tab in the staff interface header.
285
        -
286
            - pref: RetainPatronsSearchTerms
287
              choices:
288
                  0: "Don't retain"
289
                  1: "Retain"
290
            - search terms between searches when searching from the 'checkout' and 'search patrons' tab in the staff interface header.
279
        -
291
        -
280
            - pref: BiblioItemtypeInfo
292
            - pref: BiblioItemtypeInfo
281
              choices:
293
              choices:
282
- 

Return to bug 26247