From 8c3862d557b927cab4be1f84b7229bdd38530fcd Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Tue, 1 Jun 2021 08:15:49 +0000 Subject: [PATCH] Bug 26205: (QA follow-up) Change OPACNEWS to just NEWS As news are usable in OPAC and staff interface, I suggest changing the code to just be NEWS instead of OPACNEWS. Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart --- C4/NewsChannels.pm | 12 ++++++------ .../intranet-tmpl/prog/en/modules/tools/viewlog.tt | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/C4/NewsChannels.pm b/C4/NewsChannels.pm index 28a2d6074d..4b3c68311f 100644 --- a/C4/NewsChannels.pm +++ b/C4/NewsChannels.pm @@ -71,9 +71,9 @@ sub add_opac_new { $sth->execute(@values); $retval = 1; - #log the NEW OPAC news entry + #Log new news entry if (C4::Context->preference("NewsLog")) { - logaction('OPACNEWS', 'ADD' , undef, $href_entry->{lang} . ' | ' . $href_entry->{content}); + logaction('NEWS', 'ADD' , undef, $href_entry->{lang} . ' | ' . $href_entry->{content}); } } return $retval; @@ -116,9 +116,9 @@ sub upd_opac_new { $retval = 1; } - #log new OPAC news modification + #Log news entry modification if (C4::Context->preference("NewsLog")) { - logaction('OPACNEWS', 'MODIFY' , undef, $href_entry->{lang} . ' | ' . $href_entry->{content}); + logaction('NEWS', 'MODIFY' , undef, $href_entry->{lang} . ' | ' . $href_entry->{content}); } return $retval; } @@ -127,11 +127,11 @@ sub del_opac_new { my ($ids) = @_; if ($ids) { - #log new OPAC news deletion + #Log news deletion if (C4::Context->preference("NewsLog")) { foreach my $newsid ( split(/,/, $ids )) { my $n = Koha::News->find( $newsid ); - logaction('OPACNEWS', 'DELETE', undef, $n->unblessed->{lang} . ' | ' . $n->unblessed->{content} ); + logaction('NEWS', 'DELETE', undef, $n->unblessed->{lang} . ' | ' . $n->unblessed->{content} ); } } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt index 1878f6940c..3b0886d369 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt @@ -95,7 +95,7 @@ [% CASE 'SEARCHENGINE' %]Search engine [% CASE 'NOTICES' %]Notices[% UNLESS Koha.Preference('NoticesLog') %] [% END %] -[% CASE 'OPACNEWS' %]OPAC news[% UNLESS Koha.Preference('NewsLog') %] [% END %] +[% CASE 'NEWS' %]News[% UNLESS Koha.Preference('NewsLog') %] [% END %] [% CASE %][% module | html %] [% END %] [% END %] @@ -201,7 +201,7 @@ [% ELSE %] [% END %] - [% FOREACH modx IN [ 'AUTH' 'CATALOGUING' 'AUTHORITIES' 'MEMBERS' 'ACQUISITIONS' 'SERIAL' 'HOLDS' 'ILL' 'CIRCULATION' 'CLAIMS' 'FINES' 'SYSTEMPREFERENCE' 'CRONJOBS', 'REPORTS', 'SEARCHENGINE', 'NOTICES', 'OPACNEWS' ] %] + [% FOREACH modx IN [ 'AUTH' 'CATALOGUING' 'AUTHORITIES' 'MEMBERS' 'ACQUISITIONS' 'SERIAL' 'HOLDS' 'ILL' 'CIRCULATION' 'CLAIMS' 'FINES' 'SYSTEMPREFERENCE' 'CRONJOBS', 'REPORTS', 'SEARCHENGINE', 'NOTICES', 'NEWS' ] %] [% IF modules.grep(modx).size %] [% ELSE %] -- 2.39.5