gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 15485: (QA followup) Simplify logic and use *ResultsDisplay value during upgrade 

This patch makes the new sysprefs work as the previously defined. Instead of falling back
to what *ResultsDisplay is set, it now has its own 'default' (that still defaults to the
*Results*.xslt).

The default values are set to 'default' as the rest of XSLT-related sysprefs, and the upgrade
picks whatever is set in OPACXSLTResultsDisplay and XSLTResultsDisplay so current behaviour
is preserved.

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
New XSLTs for Lists work as advertised

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
This commit is contained in:
Tomas Cohen Arazi 2016-06-22 14:52:03 -03:00 committed by Kyle M Hall
parent add61ef614
commit 609f537128
6 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
installer/data/mysql/atomicupdate/bug_15485_xslt_for_lists.sql
View File

@ -1,19 +1,24 @@
INSERT IGNORE INTO systempreferences ( variable, value, options, explanation,type )
VALUES ('OPACXSLTListsDisplay','','','Enable XSLT stylesheet control over lists pages display on OPAC','Free');
INSERT IGNORE INTO systempreferences ( variable, value, options, explanation,type )
VALUES ('XSLTListsDisplay','','','Enable XSLT stylesheet control over lists pages display on intranet','Free');
INSERT IGNORE INTO systempreferences ( variable, value, options, explanation, type )
SELECT 'OPACXSLTListsDisplay', COALESCE(value,''), '', 'Enable XSLT stylesheet control over lists pages display on OPAC', 'Free'
FROM systempreferences WHERE variable='OPACXSLTResultsDisplay';
INSERT IGNORE INTO systempreferences ( variable, value, options, explanation, type )
SELECT 'XSLTListsDisplay', COALESCE(value,''), '', 'Enable XSLT stylesheet control over lists pages display on intranet', 'Free'
FROM systempreferences WHERE variable='XSLTResultsDisplay';
-- $DBversion = '16.06.00.XXX';
-- if ( CheckVersion($DBversion) ) {
-- $dbh->do(q{
-- INSERT IGNORE INTO systempreferences ( variable, value, options, explanation,type )
-- VALUES ('OPACXSLTListsDisplay','','','Enable XSLT stylesheet control over lists pages display on OPAC','Free')
-- INSERT IGNORE INTO systempreferences ( variable, value, options, explanation, type )
-- SELECT 'OPACXSLTListsDisplay', COALESCE(value,''), '', 'Enable XSLT stylesheet control over lists pages display on OPAC', 'Free'
-- FROM systempreferences WHERE variable='OPACXSLTResultsDisplay';
-- });
-- $dbh->do(q{
-- INSERT IGNORE INTO systempreferences ( variable, value, options, explanation,type )
-- VALUES ('XSLTListsDisplay','','','Enable XSLT stylesheet control over lists pages display on intranet','Free')
-- INSERT IGNORE INTO systempreferences ( variable, value, options, explanation, type )
-- SELECT 'XSLTListsDisplay', COALESCE(value,''), '', 'Enable XSLT stylesheet control over lists pages display on intranet', 'Free'
-- FROM systempreferences WHERE variable='XSLTResultsDisplay';
-- });
-- print "Upgrade to $DBversion done (Bug 15485: Allow choosing different XSLTs for lists)\n";

4
installer/data/mysql/sysprefs.sql
View File

@ -360,7 +360,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
('opacuserlogin','1',NULL,'Enable or disable display of user login features','YesNo'),
('OPACViewOthersSuggestions','0',NULL,'If ON, allows all suggestions to be displayed in the OPAC','YesNo'),
('OPACXSLTDetailsDisplay','default','','Enable XSL stylesheet control over details page display on OPAC','Free'),
('OPACXSLTListsDisplay','','','Enable XSLT stylesheet control over lists pages display on OPAC','Free'),
('OPACXSLTListsDisplay','default','','Enable XSLT stylesheet control over lists pages display on OPAC','Free'),
('OPACXSLTResultsDisplay','default','','Enable XSL stylesheet control over results page display on OPAC','Free'),
('OpenLibraryCovers','0',NULL,'If ON Openlibrary book covers will be show','YesNo'),
('OpenLibrarySearch','0',NULL,'If Yes Open Library search results will show in OPAC','YesNo'),
@ -535,7 +535,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
('XISBN','0','','Use with FRBRizeEditions. If ON, Koha will use the OCLC xISBN web service in the Editions tab on the detail pages. See: http://www.worldcat.org/affiliate/webservices/xisbn/app.jsp','YesNo'),
('XISBNDailyLimit','999','','The xISBN Web service is free for non-commercial use when usage does not exceed 1000 requests per day','Integer'),
('XSLTDetailsDisplay','default','','Enable XSL stylesheet control over details page display on intranet','Free'),
('XSLTListsDisplay','','','Enable XSLT stylesheet control over lists pages display on intranet','Free'),
('XSLTListsDisplay','default','','Enable XSLT stylesheet control over lists pages display on intranet','Free'),
('XSLTResultsDisplay','default','','Enable XSL stylesheet control over results page display on intranet','Free'),
('z3950AuthorAuthFields','701,702,700',NULL,'Define the MARC biblio fields for Personal Name Authorities to fill biblio.author','free'),
('z3950NormalizeAuthor','0','','If ON, Personal Name Authorities will replace authors in biblio.author','YesNo')

2
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
View File

@ -83,7 +83,7 @@ OPAC:
- 'Display lists in the OPAC using XSLT stylesheet at: '
- pref: OPACXSLTListsDisplay
class: file
- '<br />Options:<ul><li><a href="#" class="set_syspref" data-syspref="OPACXSLTListsDisplay" data-value="">Leave empty</a> for the default stylesheet (picked from OPACXSLTResultsDisplay).</li><li> put a path to define an xslt file.</li><li>put an URL for an external specific stylesheet.</li></ul>{langcode} will be replaced with current interface language'
- '<br />Options:<ul><li><a href="#" class="set_syspref" data-syspref="OPACXSLTListsDisplay" data-value="">Leave empty</a> for "no xslt"</li><li>enter "<a href="#" class="set_syspref" data-syspref="OPACXSLTListsDisplay" data-value="default">default</a>" for the default one</li><li> put a path to define a xslt file</li><li>put an URL for an external specific stylesheet.</li></ul>{langcode} will be replaced with current interface language'
-
- 'Display OPAC results using XSLT stylesheet at: '
- pref: OPACXSLTResultsDisplay

2
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref
View File

@ -59,7 +59,7 @@ Staff Client:
- 'Display lists in the staff client using XSLT stylesheet at: '
- pref: XSLTListsDisplay
class: file
- '<br />Options:<ul><li><a href="#" class="set_syspref" data-syspref="XSLTListsDisplay" data-value="">Leave empty</a> for the default stylesheet (picked from XSLTResultsDisplay).</li><li> put a path to define an xslt file.</li><li>put an URL for an external specific stylesheet.</li></ul>{langcode} will be replaced with current interface language'
- '<br />Options:<ul><li><a href="#" class="set_syspref" data-syspref="XSLTListsDisplay" data-value="">Leave empty</a> for "no xslt"</li><li>enter "<a href="#" class="set_syspref" data-syspref="XSLTListsDisplay" data-value="default">default</a>" for the default one</li><li> put a path to define a xslt file</li><li>put an URL for an external specific stylesheet.</li></ul>{langcode} will be replaced with current interface language'
-
- 'Display results in the staff client using XSLT stylesheet at: '
- pref: XSLTResultsDisplay

3
opac/opac-shelves.pl
View File

@ -249,8 +249,7 @@ if ( $op eq 'view' ) {
my $borrower = GetMember( borrowernumber => $loggedinuser );
# Lists display falls back to search results configuration
my $xslfile = C4::Context->preference('OPACXSLTListsDisplay') ||
C4::Context->preference('OPACXSLTResultsDisplay');
my $xslfile = C4::Context->preference('OPACXSLTListsDisplay');
my $lang = $xslfile ? C4::Languages::getlanguage() : undef;
my $sysxml = $xslfile ? C4::XSLT::get_xslt_sysprefs() : undef;

4
virtualshelves/shelves.pl
View File

@ -215,9 +215,7 @@ if ( $op eq 'view' ) {
my $borrower = GetMember( borrowernumber => $loggedinuser );
# Lists display falls back to search results configuration
my $xslfile = C4::Context->preference('XSLTListsDisplay') ||
C4::Context->preference('XSLTResultsDisplay');
my $xslfile = C4::Context->preference('XSLTListsDisplay');
my $lang = $xslfile ? C4::Languages::getlanguage() : undef;
my $sysxml = $xslfile ? C4::XSLT::get_xslt_sysprefs() : undef;