From 494557dd2f505b33097de103aedd6c62527da331 Mon Sep 17 00:00:00 2001 From: Ivan Dziuba Date: Thu, 29 Oct 2020 16:55:30 -0400 Subject: [PATCH] Changes to be committed: modified: koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc modified: t/XSLT.t https://bugs.koha-community.org/show_bug.cgi?id=17385 --- .../en/includes/opac-detail-sidebar.inc | 30 ------------------- t/XSLT.t | 6 ++-- 2 files changed, 3 insertions(+), 33 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc index 25112275c6..21b773d998 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc @@ -57,35 +57,6 @@
  • [% filesOption.filename %]
  • - [% END %] - [% END %] - - - -======= Save record ->>>>>>> Bug 17385: Add tests for CustomXSLTExportList [% END %] diff --git a/t/XSLT.t b/t/XSLT.t index 4e64e8b24d..d80397e6ed 100755 --- a/t/XSLT.t +++ b/t/XSLT.t @@ -73,9 +73,9 @@ is(find_and_slurp($dir, 'test', 'fr-FR'), 'Theme test, language en', 'Fell ba is(find_and_slurp($dir, 'nope', 'es-ES'), 'Theme prog, language es-ES', 'Fell back to prog/es-ES for nope/es-ES'); is(find_and_slurp($dir, 'nope', 'fr-FR'), 'Theme prog, language en', 'Fell back to prog/en for nope/fr-FR'); -my $matching_string = q{0}; +my $matching_string = q{[0|1]}; my $sysprefs_xml = C4::XSLT::get_xslt_sysprefs(); -ok( $sysprefs_xml =~ m/$matching_string/, 'singleBranchMode has a value of 0'); +ok( $sysprefs_xml =~ m/$matching_string/, 'singleBranchMode has no value'); t::lib::Mocks::mock_config('opachtdocs', "$dir"); make_path("$dir/bootstrap/en/xslt/biblioexport"); @@ -106,4 +106,4 @@ close $fh; my @custom_xslts = @{C4::XSLT::CustomXSLTExportList(1)}; ok((scalar @custom_xslts) == 2, "CustomXSLTExportList finds custom XSLTs"); ok($custom_xslts[0]->{filename} eq "Export 01", "Title is specified in root node"); -ok($custom_xslts[1]->{filename} eq "export_02", "Title is filename if not specified"); \ No newline at end of file +ok($custom_xslts[1]->{filename} eq "export_02", "Title is filename if not specified"); -- 2.17.1