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

Bug 15485: (QA followup) Fix behaviour and default values 

Jonathan noticed the current behaviour is that the lists rendering
falls back to the XSLTResults, and if not defined (i.e. != 'default' and
!= some_path) it falls back to a legacy display (non-XSLT).

The patchset changed this behaviour because 'default' is not a valid value
for the lists. So it should fallback to the current behaivour (i.e. Results
XSLT configuration) if not defined. This patch fixes this by adding
 || C4::Context->preference('XSLTResultsDisplay')
(and the OPAC counterpart).

It also fixes minor glitches on the update message (oops) and bad default value
in sysprefs.sql  for 'XSLTListsDisplay'.

Thanks Jonathan!

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
This commit is contained in:
Tomas Cohen Arazi 2016-06-14 13:16:13 -03:00 committed by Kyle M Hall
parent 04143f6a9c
commit add61ef614
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,6 +16,6 @@ VALUES ('XSLTListsDisplay','','','Enable XSLT stylesheet control over lists page
-- });
-- print "Upgrade to $DBversion done (Bug 12528 - Enable staff to deny message setting access to patrons on the OPAC)\n";
-- print "Upgrade to $DBversion done (Bug 15485: Allow choosing different XSLTs for lists)\n";
-- SetVersion($DBversion);
-- }

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

@ -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','default','','Enable XSLT stylesheet control over lists pages display on intranet','Free'),
('XSLTListsDisplay','','','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')

4
opac/opac-shelves.pl
View File

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

4
virtualshelves/shelves.pl
View File

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