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

(-)a/installer/data/mysql/atomicupdate/bug_14715-searchresults_syspref.sql (-2 / +3 lines)
Lines 1-2 Link Here
1
INSERT IGNORE INTO systempreferences (`variable`, `value`, `options`, `explanation`,`type`) VALUES ('OPACnumSearchResultsPerPage', '10,20,40,60,80,100', NULL, 'Option list of number of results per page to show in OPAC search results','YesNo');
1
INSERT IGNORE INTO systempreferences (`variable`, `value`, `options`, `explanation`,`type`) VALUES
2
INSERT IGNORE INTO systempreferences (`variable`, `value`, `options`, `explanation`,`type`) VALUES ('numSearchResultsPerPage', '10,20,40,60,80,100', NULL, 'Option list of number of results per page to show in staff client search results','YesNo');
2
 ('OPACnumSearchResultsPerPage', '10,20,40,60,80,100', NULL, 'Option list of number of results per page to show in OPAC search results','YesNo'),
3
 ('numSearchResultsPerPage', '10,20,40,60,80,100', NULL, 'Option list of number of results per page to show in staff client search results','YesNo');
(-)a/installer/data/mysql/sysprefs.sql (+2 lines)
Lines 304-309 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
304
('numReturnedItemsToShow','20',NULL,'Number of returned items to show on the check-in page','Integer'),
304
('numReturnedItemsToShow','20',NULL,'Number of returned items to show on the check-in page','Integer'),
305
('NumSavedReports', '20', NULL, 'By default, show this number of saved reports.', 'Integer'),
305
('NumSavedReports', '20', NULL, 'By default, show this number of saved reports.', 'Integer'),
306
('numSearchResults','20',NULL,'Specify the maximum number of results to display on a page of results','Integer'),
306
('numSearchResults','20',NULL,'Specify the maximum number of results to display on a page of results','Integer'),
307
('numSearchResultsPerPage', '10,20,40,60,80,100', NULL, 'Option list of number of results per page to show in staff client search results','YesNo'),
307
('numSearchRSSResults','50',NULL,'Specify the maximum number of results to display on a RSS page of results','Integer'),
308
('numSearchRSSResults','50',NULL,'Specify the maximum number of results to display on a RSS page of results','Integer'),
308
('OAI-PMH','0',NULL,'if ON, OAI-PMH server is enabled','YesNo'),
309
('OAI-PMH','0',NULL,'if ON, OAI-PMH server is enabled','YesNo'),
309
('OAI-PMH:archiveID','KOHA-OAI-TEST',NULL,'OAI-PMH archive identification','Free'),
310
('OAI-PMH:archiveID','KOHA-OAI-TEST',NULL,'OAI-PMH archive identification','Free'),
Lines 371-376 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
371
('OPACNoResultsFound','','70|10','Display this HTML when no results are found for a search in the OPAC','Textarea'),
372
('OPACNoResultsFound','','70|10','Display this HTML when no results are found for a search in the OPAC','Textarea'),
372
('OPACNumbersPreferPhrase','0',NULL,'Control the use of phr operator in callnumber and standard number OPAC searches','YesNo'),
373
('OPACNumbersPreferPhrase','0',NULL,'Control the use of phr operator in callnumber and standard number OPAC searches','YesNo'),
373
('OPACnumSearchResults','20',NULL,'Specify the maximum number of results to display on a page of results','Integer'),
374
('OPACnumSearchResults','20',NULL,'Specify the maximum number of results to display on a page of results','Integer'),
375
('OPACnumSearchResultsPerPage', '10,20,40,60,80,100', NULL, 'Option list of number of results per page to show in OPAC search results','YesNo'),
374
('OpacPasswordChange','1',NULL,'If ON, enables patron-initiated password change in OPAC (disable it when using LDAP auth)','YesNo'),
376
('OpacPasswordChange','1',NULL,'If ON, enables patron-initiated password change in OPAC (disable it when using LDAP auth)','YesNo'),
375
('OPACPatronDetails','1','','If OFF the patron details tab in the OPAC is disabled.','YesNo'),
377
('OPACPatronDetails','1','','If OFF the patron details tab in the OPAC is disabled.','YesNo'),
376
('OPACpatronimages','0',NULL,'Enable patron images in the OPAC','YesNo'),
378
('OPACpatronimages','0',NULL,'Enable patron images in the OPAC','YesNo'),
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt (-2 lines)
Lines 14-20 Link Here
14
[% ELSE %]
14
[% ELSE %]
15
    [% SET DetailPage="detail.pl" %]
15
    [% SET DetailPage="detail.pl" %]
16
[% END %]
16
[% END %]
17
<<<<<<< HEAD
18
[% INCLUDE 'doc-head-open.inc' %]
17
[% INCLUDE 'doc-head-open.inc' %]
19
<title>Koha &rsaquo; Catalog &rsaquo; [% IF ( searchdesc ) %]Results of search [% IF ( query_desc ) %]for '[% query_desc | html %]'[% END %][% IF ( limit_desc ) %]&nbsp;with limit(s):&nbsp;'[% limit_desc | html %]'[% END %][% ELSE %]You did not specify any search criteria[% END %]</title>
18
<title>Koha &rsaquo; Catalog &rsaquo; [% IF ( searchdesc ) %]Results of search [% IF ( query_desc ) %]for '[% query_desc | html %]'[% END %][% IF ( limit_desc ) %]&nbsp;with limit(s):&nbsp;'[% limit_desc | html %]'[% END %][% ELSE %]You did not specify any search criteria[% END %]</title>
20
[% INCLUDE 'doc-head-close.inc' %]
19
[% INCLUDE 'doc-head-close.inc' %]
21
- 

Return to bug 14715