The commit for bug 8947 has the side-effect of (when the language is English) causing the theme syspref to be ignored when looking for an XSLT stylesheet for bib details or search result display. To reproduce the bug: [1] Make sure OPAC XSLT details is turned on and that English is the OPAC language. [2] Create a new OPAC theme, including copying the XSLT files. [3] Set opactheme to the new theme. [4] Make a change to koha-tmpl/opac-tmpl/NEWTHEME/en/xslt/MARC21slim2OPACDetail.xsl [5] View a bib record in the OPAC. The change made in the previous step is not reflected.
Created attachment 18262 [details] [review] bug 10292: improve fallback logic for picking XSLT This patch fixes a bug whereby XSLT files from the prog theme would be used (for English OPACs and staff interfaces) even if the user had created and enabled a custom theme that provided override XSLT files. This patch provides a clearer implementation of the fallback logic and adds test cases. To reproduce the bug: [1] Set OPACXSLTDetailsDisplay to 'default' and English as the OPAC language. [2] Create a new OPAC theme, including copying the XSLT files. [3] Set opactheme to the new theme. [4] Make a change to koha-tmpl/opac-tmpl/NEWTHEME/en/xslt/MARC21slim2OPACDetail.xsl [5] View a bib record in the OPAC. The change made in the previous step is not reflected. To test after applying the patch: [6] Reload the bib record in the OPAC. The change made in step 4 should now be reflected. [7] (To be thorough) Go through the test plan for bug 8947 and verify that there is no regression. Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Created attachment 18442 [details] [review] bug 10292: improve fallback logic for picking XSLT This patch fixes a bug whereby XSLT files from the prog theme would be used (for English OPACs and staff interfaces) even if the user had created and enabled a custom theme that provided override XSLT files. This patch provides a clearer implementation of the fallback logic and adds test cases. To reproduce the bug: [1] Set OPACXSLTDetailsDisplay to 'default' and English as the OPAC language. [2] Create a new OPAC theme, including copying the XSLT files. [3] Set opactheme to the new theme. [4] Make a change to koha-tmpl/opac-tmpl/NEWTHEME/en/xslt/MARC21slim2OPACDetail.xsl [5] View a bib record in the OPAC. The change made in the previous step is not reflected. To test after applying the patch: [6] Reload the bib record in the OPAC. The change made in step 4 should now be reflected. [7] (To be thorough) Go through the test plan for bug 8947 and verify that there is no regression. Signed-off-by: Galen Charlton <gmc@esilibrary.com> Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
QA comment: This patch fixes a bug and improves the code. No regression found. Thanks for unit tests! Marked as Passed QA.
Created attachment 18452 [details] [review] bug 10292: improve fallback logic for picking XSLT This patch fixes a bug whereby XSLT files from the prog theme would be used (for English OPACs and staff interfaces) even if the user had created and enabled a custom theme that provided override XSLT files. This patch provides a clearer implementation of the fallback logic and adds test cases. To reproduce the bug: [1] Set OPACXSLTDetailsDisplay to 'default' and English as the OPAC language. [2] Create a new OPAC theme, including copying the XSLT files. [3] Set opactheme to the new theme. [4] Make a change to koha-tmpl/opac-tmpl/NEWTHEME/en/xslt/MARC21slim2OPACDetail.xsl [5] View a bib record in the OPAC. The change made in the previous step is not reflected. To test after applying the patch: [6] Reload the bib record in the OPAC. The change made in step 4 should now be reflected. [7] (To be thorough) Go through the test plan for bug 8947 and verify that there is no regression. Signed-off-by: Galen Charlton <gmc@esilibrary.com> Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Pushed to master.
This patch has been pushed to 3.12.x, will be in 3.12.1. Thanks for the fix Kyle!
(In reply to comment #6) > This patch has been pushed to 3.12.x, will be in 3.12.1. Thanks for the fix > Kyle! Thanks Galen, I mixed my bug comments with 10262 :-D
Pushed to 3.10.x, will be in 3.10.7