From b774af34e3f3a422f900684eec13844efc21e213 Mon Sep 17 00:00:00 2001 From: Emmi Takkinen Date: Thu, 9 Jul 2020 11:55:03 +0300 Subject: [PATCH 1/3] Bug 16371: Fix QA issues, change terminology Sponsored-by: Koha-Suomi Oy --- Koha/Quote.pm | 4 ++-- Koha/Quotes.pm | 4 ++++ .../intranet-tmpl/prog/en/modules/admin/preferences/opac.pref | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Koha/Quote.pm b/Koha/Quote.pm index f79cf79c3f..244aea0673 100644 --- a/Koha/Quote.pm +++ b/Koha/Quote.pm @@ -113,7 +113,7 @@ sub get_daily_quote { Is a wrapper for get_daily_quote(), with an extra check for using the correct interface defined in the syspref 'QuoteOfTheDay'. -If the current interface is not allowed to display quotes, then returns undef. +If the current interface is not allowed to display quotes, then returns nothing. =cut @@ -126,7 +126,7 @@ sub get_daily_quote_for_interface { Koha::Exceptions::UnknownProgramState->throw(error => $cc[3]."()> C4::Context->interface() is not set! Don't know are you in OPAC or staff client?"); } unless ($qotdPref =~ /$interface/) { - return undef; + return; } return $self->get_daily_quote(%opts); diff --git a/Koha/Quotes.pm b/Koha/Quotes.pm index 0fe2e167f5..6a9d83af58 100644 --- a/Koha/Quotes.pm +++ b/Koha/Quotes.pm @@ -41,6 +41,10 @@ sub _type { return 'Quote'; } +=head3 object_class + +=cut + sub object_class { return 'Koha::Quote'; } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref index 6f1b28aadd..dd2faa4c92 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref @@ -518,7 +518,7 @@ OPAC: - Show quote of the day in the - pref: QuoteOfTheDay multiple: - intranet: staff client + intranet: staff interface opac: OPAC - main page. - diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt index 24d8aa499c..882a446ff1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt @@ -38,7 +38,7 @@

Quote of the Day

- [% daily_quote.text %] ~ [% daily_quote.source %] + [% daily_quote.text | html %] ~ [% daily_quote.source | html %]
[% END %] -- 2.17.1