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

(-)a/catalogue/search.pl (-2 / +2 lines)
Lines 366-373 if ($indexes[0] && (!$indexes[1] || $params->{'scan'})) { Link Here
366
# an operand can be a single term, a phrase, or a complete ccl query
366
# an operand can be a single term, a phrase, or a complete ccl query
367
my @operands = map uri_unescape($_), $cgi->multi_param('q');
367
my @operands = map uri_unescape($_), $cgi->multi_param('q');
368
368
369
# if a simple search, display the value in the search box
369
# if a simple search and StaffRetainSearchTerms, display the value in the search box
370
if ($operands[0] && !$operands[1]) {
370
if (C4::Context->preference('StaffRetainSearchTerms') && $operands[0] && !$operands[1]) {
371
    my $ms_query = $operands[0];
371
    my $ms_query = $operands[0];
372
    $ms_query =~ s/ #\S+//;
372
    $ms_query =~ s/ #\S+//;
373
    $template->param(ms_value => $ms_query);
373
    $template->param(ms_value => $ms_query);
(-)a/installer/data/mysql/mandatory/sysprefs.sql (+1 lines)
Lines 633-638 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
633
('StaffDetailItemSelection', '1', NULL, 'Enable item selection in record detail page', 'YesNo'),
633
('StaffDetailItemSelection', '1', NULL, 'Enable item selection in record detail page', 'YesNo'),
634
('StaffLangSelectorMode','footer','top|both|footer','Select the location to display the language selector in staff interface','Choice'),
634
('StaffLangSelectorMode','footer','top|both|footer','Select the location to display the language selector in staff interface','Choice'),
635
('StaffLoginInstructions', '', NULL, 'HTML to go into the login box for the staff interface','Free'),
635
('StaffLoginInstructions', '', NULL, 'HTML to go into the login box for the staff interface','Free'),
636
('StaffRetainSearchTerms', '1', NULL, 'If enabled, searches entered into the search bar will be retained', 'YesNo'),
636
('StaffSearchResultsDisplayBranch','holdingbranch','holdingbranch|homebranch','Controls the display of the home or holding branch for staff search results','Choice'),
637
('StaffSearchResultsDisplayBranch','holdingbranch','holdingbranch|homebranch','Controls the display of the home or holding branch for staff search results','Choice'),
637
('StaffSerialIssueDisplayCount','3','','Number of serial issues to display per subscription in the staff interface','Integer'),
638
('StaffSerialIssueDisplayCount','3','','Number of serial issues to display per subscription in the staff interface','Integer'),
638
('StaticHoldsQueueWeight','0',NULL,'Specify a list of library location codes separated by commas -- the list of codes will be traversed and weighted with first values given higher weight for holds fulfillment -- alternatively, if RandomizeHoldsQueueWeight is set, the list will be randomly selective','Integer'),
639
('StaticHoldsQueueWeight','0',NULL,'Specify a list of library location codes separated by commas -- the list of codes will be traversed and weighted with first values given higher weight for holds fulfillment -- alternatively, if RandomizeHoldsQueueWeight is set, the list will be randomly selective','Integer'),
(-)a/installer/data/mysql/updatedatabase.pl (-1 lines)
Lines 23267-23273 if( CheckVersion( $DBversion ) ) { Link Here
23267
$DBversion = '20.06.00.063';
23267
$DBversion = '20.06.00.063';
23268
if( CheckVersion( $DBversion ) ) {
23268
if( CheckVersion( $DBversion ) ) {
23269
    $dbh->do(q{INSERT IGNORE INTO circulation_rules (branchcode, categorycode, itemtype, rule_name, rule_value) VALUES (NULL, NULL, NULL, 'decreaseloanholds', NULL) });
23269
    $dbh->do(q{INSERT IGNORE INTO circulation_rules (branchcode, categorycode, itemtype, rule_name, rule_value) VALUES (NULL, NULL, NULL, 'decreaseloanholds', NULL) });
23270
23271
    NewVersion( $DBversion, 14866, "Add decreaseloanholds circulation rule" );
23270
    NewVersion( $DBversion, 14866, "Add decreaseloanholds circulation rule" );
23272
}
23271
}
23273
23272
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref (-1 / +7 lines)
Lines 261-266 Searching: Link Here
261
                  0: "don't search"
261
                  0: "don't search"
262
            - on all variations of the ISBN.
262
            - on all variations of the ISBN.
263
        -
263
        -
264
            - When searching from the header in the staff client
265
            - pref: StaffRetainSearchTerms
266
              choices:
267
                  yes: "retain"
268
                  no: "don't retain"
269
            - search terms between searches.
270
        -
264
            - pref: BiblioItemtypeInfo
271
            - pref: BiblioItemtypeInfo
265
              choices:
272
              choices:
266
                  1: "Display"
273
                  1: "Display"
267
- 

Return to bug 26247