Attachment 119295 Details for Bug 28108 – Bug 28108: Fix filtering

[patch] Bug 28108: Fix filtering

Bug-28108-Fix-filtering.patch (text/plain), 7.92 KB, created by Martin Renvoize (ashimema) on 2021-04-07 13:39:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2021-04-07 13:39:14 UTC

Size: 7.92 KB

patch

obsolete

>From 8e0a891175053c0c4a184d4fa1b590f8940e0655 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Wed, 7 Apr 2021 14:25:24 +0100
>Subject: [PATCH] Bug 28108: Fix filtering
>
>---
> C4/Letters.pm                                      |  4 ++--
> C4/UsageStats.pm                                   |  2 +-
> installer/data/mysql/atomicupdate/claimslog.perl   | 14 ++++++++++++++
> installer/data/mysql/mandatory/sysprefs.sql        |  2 +-
> .../prog/en/modules/admin/preferences/logs.pref    |  2 +-
> .../intranet-tmpl/prog/en/modules/tools/viewlog.tt |  4 ++--
> t/db_dependent/Letters.t                           |  8 ++++----
> t/db_dependent/UsageStats.t                        |  2 +-
> 8 files changed, 26 insertions(+), 12 deletions(-)
> create mode 100644 installer/data/mysql/atomicupdate/claimslog.perl
>
>diff --git a/C4/Letters.pm b/C4/Letters.pm
>index 28b90fded0..c72fee1ef5 100644
>--- a/C4/Letters.pm
>+++ b/C4/Letters.pm
>@@ -534,7 +534,7 @@ sub SendAlerts {
>             unless $success;
> 
>         logaction(
>-            "ACQUISITION",
>+            "CLAIMS",
>             $action,
>             undef,
>             "To="
>@@ -543,7 +543,7 @@ sub SendAlerts {
>                 . $letter->{title}
>                 . " Content="
>                 . $letter->{content}
>-        ) if C4::Context->preference("LetterLog");
>+        ) if C4::Context->preference("ClaimsLog");
>     }
>    # send an "account details" notice to a newly created user
>     elsif ( $type eq 'members' ) {
>diff --git a/C4/UsageStats.pm b/C4/UsageStats.pm
>index 21b461929f..65d3858bc4 100644
>--- a/C4/UsageStats.pm
>+++ b/C4/UsageStats.pm
>@@ -222,7 +222,7 @@ sub BuildReport {
>         CataloguingLog
>         FinesLog
>         IssueLog
>-        LetterLog
>+        ClaimsLog
>         ReturnLog
>         SubscriptionLog
>         BiblioDefaultView
>diff --git a/installer/data/mysql/atomicupdate/claimslog.perl b/installer/data/mysql/atomicupdate/claimslog.perl
>new file mode 100644
>index 0000000000..8045b7d147
>--- /dev/null
>+++ b/installer/data/mysql/atomicupdate/claimslog.perl
>@@ -0,0 +1,14 @@
>+$DBversion = 'XXX';    # will be replaced by the RM
>+if ( CheckVersion($DBversion) ) {
>+    $dbh->do(q{
>+        UPDATE action_logs SET module = 'CLAIMS'
>+        WHERE module = 'ACQUISITIONS' AND ( action = 'SERIAL CLAIM' OR action = 'ACQUISITION ORDER' OR action = 'ACQUISITION CLAIM')
>+    });
>+
>+    $dbh->do(q{
>+        UPDATE systempreferences SET variable = 'ClaimsLog' WHERE variable = 'LetterLog';
>+    });
>+
>+    # Always end with this (adjust the bug info)
>+    NewVersion( $DBversion, XXXXX, "Description" );
>+}
>diff --git a/installer/data/mysql/mandatory/sysprefs.sql b/installer/data/mysql/mandatory/sysprefs.sql
>index 045c6df647..a8f2353be4 100644
>--- a/installer/data/mysql/mandatory/sysprefs.sql
>+++ b/installer/data/mysql/mandatory/sysprefs.sql
>@@ -296,7 +296,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
> ('KohaManualLanguage','en','en|ar|cs|de|es|fr|it|pt_BR|tr|zh_TW','What is the language of the online manual you want to use?','Choice'),
> ('LabelMARCView','standard','standard|economical','Define how a MARC record will display','Choice'),
> ('language','en',NULL,'Set the default language in the staff interface.','Languages'),
>-('LetterLog','1',NULL,'If ON, log all notices sent','YesNo'),
>+('ClaimsLog','1',NULL,'If ON, log all notices sent','YesNo'),
> ('LibraryName','','','Define the library name as displayed on the OPAC',''),
> ('LibraryThingForLibrariesEnabled','0','','Enable or Disable Library Thing for Libraries Features','YesNo'),
> ('LibraryThingForLibrariesID','','','See:http://librarything.com/forlibraries/','free'),
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/logs.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/logs.pref
>index 6488e62e57..4f4945e1af 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/logs.pref
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/logs.pref
>@@ -1,7 +1,7 @@
> Logging:
>     Logging:
>         -
>-            - pref: LetterLog
>+            - pref: ClaimsLog
>               choices:
>                   1: Log
>                   0: "Don't log"
>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 175474f998..9b8becef8e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
>@@ -84,7 +84,7 @@
> 
> [%        CASE 'CIRCULATION'  %]Circulation[% UNLESS Koha.Preference('IssueLog') %] <i class="fa fa-warning" title="Log not enabled"></i>[% END %]
> 
>-[%        CASE 'LETTER'       %]Letter[% UNLESS Koha.Preference('LetterLog') %] <i class="fa fa-warning" title="Log not enabled"></i>[% END %]
>+[%        CASE 'CLAIMS'       %]Claims[% UNLESS Koha.Preference('ClaimsLog') %] <i class="fa fa-warning" title="Log not enabled"></i>[% END %]
> 
> [%        CASE 'FINES'        %]Fines[% UNLESS Koha.Preference('FinesLog') %] <i class="fa fa-warning" title="Log not enabled"></i>[% END %]
> 
>@@ -191,7 +191,7 @@
>                                         [% ELSE %]
>                                             <label for="moduleALL" class="viewlog"><input type="checkbox" id="moduleALL" name="modules" value=""> All</label>
>                                         [% END %]
>-                                        [% FOREACH modx IN [ 'AUTH' 'CATALOGUING' 'AUTHORITIES' 'MEMBERS' 'ACQUISITIONS' 'SERIAL' 'HOLDS' 'ILL' 'CIRCULATION' 'LETTER' 'FINES' 'SYSTEMPREFERENCE' 'CRONJOBS', 'REPORTS', 'SEARCHENGINE', 'NOTICES' ] %]
>+                                        [% FOREACH modx IN [ 'AUTH' 'CATALOGUING' 'AUTHORITIES' 'MEMBERS' 'ACQUISITIONS' 'SERIAL' 'HOLDS' 'ILL' 'CIRCULATION' 'CLAIMS' 'FINES' 'SYSTEMPREFERENCE' 'CRONJOBS', 'REPORTS', 'SEARCHENGINE', 'NOTICES' ] %]
>                                             [% IF modules.grep(modx).size %]
>                                                 <label for="module[% modx | html %]" class="viewlog"><input type="checkbox" id="module[% modx | html %]" name="modules" value="[% modx | html %]" checked="checked"> [% PROCESS translate_log_module module=modx %]</label>
>                                             [% ELSE %]
>diff --git a/t/db_dependent/Letters.t b/t/db_dependent/Letters.t
>index 35eb84d32e..48ad044862 100755
>--- a/t/db_dependent/Letters.t
>+++ b/t/db_dependent/Letters.t
>@@ -454,8 +454,8 @@ is($err->{'error'}, 'no_email', "Trying to send an alert when there's no e-mail
> $bookseller = Koha::Acquisition::Booksellers->find( $booksellerid );
> $bookseller->contacts->next->email('testemail@mydomain.com')->store;
> 
>-# Ensure that the preference 'LetterLog' is set to logging
>-t::lib::Mocks::mock_preference( 'LetterLog', 'on' );
>+# Ensure that the preference 'ClaimsLog' is set to logging
>+t::lib::Mocks::mock_preference( 'ClaimsLog', 'on' );
> 
> # SendAlerts needs branchemail or KohaAdminEmailAddress as sender
> t::lib::Mocks::mock_preference( 'KohaAdminEmailAddress', 'library@domain.com' );
>@@ -633,8 +633,8 @@ subtest 'SendAlerts - claimissue' => sub {
>     $bookseller = Koha::Acquisition::Booksellers->find( $booksellerid );
>     $bookseller->contacts->next->email('testemail@mydomain.com')->store;
> 
>-    # Ensure that the preference 'LetterLog' is set to logging
>-    t::lib::Mocks::mock_preference( 'LetterLog', 'on' );
>+    # Ensure that the preference 'ClaimsLog' is set to logging
>+    t::lib::Mocks::mock_preference( 'ClaimsLog', 'on' );
> 
>     # SendAlerts needs branchemail or KohaAdminEmailAddress as sender
>     t::lib::Mocks::mock_userenv({ branchcode => $library->{branchcode} });
>diff --git a/t/db_dependent/UsageStats.t b/t/db_dependent/UsageStats.t
>index ff793c8e94..0bddf6713e 100755
>--- a/t/db_dependent/UsageStats.t
>+++ b/t/db_dependent/UsageStats.t
>@@ -483,7 +483,7 @@ sub mocking_systempreferences_to_a_set_value {
>         CataloguingLog
>         FinesLog
>         IssueLog
>-        LetterLog
>+        ClaimsLog
>         ReturnLog
>         SubscriptionLog
>         BiblioDefaultView
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 28108: 119295 | 119548 | 120747 | 120748 | 120749 | 120763 | 120781 | 120782 | 120791