Attachment 126831 Details for Bug 29246 – Bug 29246: Rename pref template between double quotes

[patch] Bug 29246: Rename pref template between double quotes

Bug-29246-Rename-pref-template-between-double-quot.patch (text/plain), 2.96 KB, created by Marcel de Rooy on 2021-10-25 13:13:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel de Rooy

Created: 2021-10-25 13:13:44 UTC

Size: 2.96 KB

patch

obsolete

>From eace1328c329136b4fd0143f44e661c8c3e99b6e Mon Sep 17 00:00:00 2001
>From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>Date: Mon, 25 Oct 2021 12:57:31 +0000
>Subject: [PATCH] Bug 29246: Rename pref template between double quotes
>Content-Type: text/plain; charset=utf-8
>
>Result of
>git grep -l "\"template\"" ':!*.po' ':!*.js'  | \
>    xargs sed -i -e "s/\"template\"/\"intranet_theme\"/g"
>
>Excluding:
>git checkout --  Koha/Schema/Result/MarcModificationTemplateAction.pm
>---
> C4/Breeding.pm           | 2 +-
> C4/XSLT.pm               | 6 +++---
> misc/cronjobs/rss/rss.pl | 2 +-
> 3 files changed, 5 insertions(+), 5 deletions(-)
>
>diff --git a/C4/Breeding.pm b/C4/Breeding.pm
>index 75f47c668a..eda414c1f6 100644
>--- a/C4/Breeding.pm
>+++ b/C4/Breeding.pm
>@@ -327,7 +327,7 @@ sub _do_xslt_proc {
>     return $marc if !$server->{add_xslt};
> 
>     my $htdocs = C4::Context->config('intrahtdocs');
>-    my $theme = C4::Context->preference("template"); #staff
>+    my $theme = C4::Context->preference("intranet_theme"); #staff
>     my $lang = C4::Languages::getlanguage() || 'en';
> 
>     my @files= split ',', $server->{add_xslt};
>diff --git a/C4/XSLT.pm b/C4/XSLT.pm
>index ec8cfe232f..a5ad42ab45 100644
>--- a/C4/XSLT.pm
>+++ b/C4/XSLT.pm
>@@ -199,12 +199,12 @@ sub get_xsl_filename {
> 
>         if ($xslsyspref eq "XSLTDetailsDisplay") {
>             $htdocs  = C4::Context->config('intrahtdocs');
>-            $theme   = C4::Context->preference("template");
>+            $theme   = C4::Context->preference("intranet_theme");
>             $xslfile = C4::Context->preference('marcflavour') .
>                        "slim2intranetDetail.xsl";
>         } elsif ($xslsyspref eq "XSLTResultsDisplay") {
>             $htdocs  = C4::Context->config('intrahtdocs');
>-            $theme   = C4::Context->preference("template");
>+            $theme   = C4::Context->preference("intranet_theme");
>             $xslfile = C4::Context->preference('marcflavour') .
>                         "slim2intranetResults.xsl";
>         } elsif ($xslsyspref eq "OPACXSLTDetailsDisplay") {
>@@ -220,7 +220,7 @@ sub get_xsl_filename {
>         } elsif ($xslsyspref eq 'XSLTListsDisplay') {
>             # Lists default to *Results.xslt
>             $htdocs  = C4::Context->config('intrahtdocs');
>-            $theme   = C4::Context->preference("template");
>+            $theme   = C4::Context->preference("intranet_theme");
>             $xslfile = C4::Context->preference('marcflavour') .
>                         "slim2intranetResults.xsl";
>         } elsif ($xslsyspref eq 'OPACXSLTListsDisplay') {
>diff --git a/misc/cronjobs/rss/rss.pl b/misc/cronjobs/rss/rss.pl
>index cfdd078b42..29b3ff4f9e 100755
>--- a/misc/cronjobs/rss/rss.pl
>+++ b/misc/cronjobs/rss/rss.pl
>@@ -59,7 +59,7 @@ my $vars    = {
>     ITEMS => getItems( $config{'query'} )
> };
> 
>-my $template_path = $config{"template"};
>+my $template_path = $config{"intranet_theme"};
> open( my $fh, "<", $template_path ) or die "cannot open $template_path : $!";
> $feed->process( $fh, $vars, $outFile );
> 
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 29246: 126828 | 126829 | 126830 | 126831 | 126832