From 66d41f9ddd1a762f054e29fe28684912b5aec397 Mon Sep 17 00:00:00 2001 From: Lari Taskula Date: Thu, 27 Oct 2016 16:25:05 +0300 Subject: [PATCH] Bug 18595: Remove references to C4::Members::Messaging MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To test: 1. grep -r 'C4::Members::Messaging' This command should not produce any results in Koha source code after this patch. 2. Check the pages touched by this commit 3. Try setting and viewing patron and patron category messaging preferences As this completes the move from C4::Members::Messaging to new Koha-objects for messaging preferences, everything should be ready for proper testing. Make sure you have EnhancedMessagingPreferences system preference enabled. Then, try creating new categories and setting default messaging preferences, as well as editing the messaging preferences of the already existing categories. Try adding new patrons and make sure the default patron messaging preferences are by default the same that you set for that category. Edit already exisiting patrons' messaging preferences and make sure changes are applied. Observe no crash at any point, otherwise fail this patch. Don't forget to test both intranet and OPAC. Finally, run unit tests: 1. prove t/db_dependent/Circulation.t 2. prove t/db_dependent/Reserves.t 3. prove t/db_dependent/Koha/Patron/Categories.t Signed-off-by: Marc VĂ©ron Signed-off-by: David Bourgault --- C4/Auth_with_ldap.pm | 1 - C4/Form/MessagingPreferences.pm | 3 +- C4/Members/Messaging.pm | 95 ---------------------- C4/Message.pm | 2 +- C4/Reserves.pm | 1 - Koha/Patron/Category.pm | 2 - circ/returns.pl | 1 - misc/cronjobs/advance_notices.pl | 1 - .../borrowers-force-messaging-defaults.pl | 1 - opac/opac-messaging.pl | 1 - t/Members_Messaging.t | 14 ---- tools/import_borrowers.pl | 1 - 12 files changed, 2 insertions(+), 121 deletions(-) delete mode 100644 C4/Members/Messaging.pm delete mode 100755 t/Members_Messaging.t diff --git a/C4/Auth_with_ldap.pm b/C4/Auth_with_ldap.pm index 00732a7..817a66f 100644 --- a/C4/Auth_with_ldap.pm +++ b/C4/Auth_with_ldap.pm @@ -26,7 +26,6 @@ use C4::Context; use C4::Members qw(AddMember); use C4::Members::Attributes; use C4::Members::AttributeTypes; -use C4::Members::Messaging; use C4::Auth qw(checkpw_internal); use Koha::Patrons; use Koha::AuthUtils qw(hash_password); diff --git a/C4/Form/MessagingPreferences.pm b/C4/Form/MessagingPreferences.pm index 1559d1b..01e2892 100644 --- a/C4/Form/MessagingPreferences.pm +++ b/C4/Form/MessagingPreferences.pm @@ -22,7 +22,6 @@ use warnings; use CGI qw ( -utf8 ); use C4::Context; -use C4::Members::Messaging; use C4::Debug; use Koha::Patron::Message::Preferences; use Koha::Patrons; @@ -178,7 +177,7 @@ sub set_form_values { =head1 SEE ALSO -L, F, F, F +L, F, F, F =head1 AUTHOR diff --git a/C4/Members/Messaging.pm b/C4/Members/Messaging.pm deleted file mode 100644 index a065636..0000000 --- a/C4/Members/Messaging.pm +++ /dev/null @@ -1,95 +0,0 @@ -package C4::Members::Messaging; - -# Copyright (C) 2008 LibLime -# -# This file is part of Koha. -# -# Koha is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# Koha is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Koha; if not, see . - -use strict; -use warnings; -use C4::Context; - -=head1 NAME - -C4::Members::Messaging - manage patron messaging preferences - -=head1 SYNOPSIS - - use C4::Members::Messaging - -=head1 DESCRIPTION - -This module lets you modify a patron's messaging preferences. - -=head1 TABLES - -=head2 message_queue - -The actual messages which will be sent via a cron job running -F. - -=head2 message_attributes - -What kinds of messages can be sent? - -=head2 message_transport_types - -What transports can messages be sent vith? (email, sms, etc.) - -=head2 message_transports - -How are message_attributes and message_transport_types correlated? - -=head2 borrower_message_preferences - -What messages do the borrowers want to receive? - -=head2 borrower_message_transport_preferences - -What transport should a message be sent with? - -=head1 CONFIG - -=head2 Adding a New Kind of Message to the System - -=over 4 - -=item 1. - -Add a new template to the `letter` table. - -=item 2. - -Insert a row into the `message_attributes` table. - -=item 3. - -Insert rows into `message_transports` for each message_transport_type. - -=back - -=head1 SEE ALSO - -L - -=head1 AUTHOR - -Koha Development Team - -Andrew Moore - -=cut - -1; diff --git a/C4/Message.pm b/C4/Message.pm index 30b71c8..b2b6c15 100644 --- a/C4/Message.pm +++ b/C4/Message.pm @@ -402,7 +402,7 @@ sub DESTROY { } =head1 SEE ALSO -L, L, L +L, L, L =head1 AUTHOR diff --git a/C4/Reserves.pm b/C4/Reserves.pm index 9331862..9188a97 100644 --- a/C4/Reserves.pm +++ b/C4/Reserves.pm @@ -31,7 +31,6 @@ use C4::Circulation; use C4::Accounts; # for _koha_notify_reserve -use C4::Members::Messaging; use C4::Members qw(); use C4::Letters; use C4::Log; diff --git a/Koha/Patron/Category.pm b/Koha/Patron/Category.pm index 1790e71..c61bbb2 100644 --- a/Koha/Patron/Category.pm +++ b/Koha/Patron/Category.pm @@ -19,8 +19,6 @@ use Modern::Perl; use Carp; -use C4::Members::Messaging; - use Koha::Database; use Koha::DateUtils; use Koha::Patron::Message::Preferences; diff --git a/circ/returns.pl b/circ/returns.pl index 7ae5456..2a8c32d 100755 --- a/circ/returns.pl +++ b/circ/returns.pl @@ -46,7 +46,6 @@ use C4::Reserves; use C4::Biblio; use C4::Items; use C4::Members; -use C4::Members::Messaging; use C4::Koha; # FIXME : is it still useful ? use C4::RotatingCollections; use Koha::AuthorisedValues; diff --git a/misc/cronjobs/advance_notices.pl b/misc/cronjobs/advance_notices.pl index 943b57d..a9bc9cf 100755 --- a/misc/cronjobs/advance_notices.pl +++ b/misc/cronjobs/advance_notices.pl @@ -53,7 +53,6 @@ use C4::Biblio; use C4::Context; use C4::Letters; use C4::Members; -use C4::Members::Messaging; use C4::Overdues; use Koha::DateUtils; use C4::Log; diff --git a/misc/maintenance/borrowers-force-messaging-defaults.pl b/misc/maintenance/borrowers-force-messaging-defaults.pl index fff4537..36d426e 100755 --- a/misc/maintenance/borrowers-force-messaging-defaults.pl +++ b/misc/maintenance/borrowers-force-messaging-defaults.pl @@ -27,7 +27,6 @@ BEGIN { } use C4::Context; -use C4::Members::Messaging; use Koha::Patrons; use Getopt::Long; use Pod::Usage; diff --git a/opac/opac-messaging.pl b/opac/opac-messaging.pl index a110e1c..3b8757e 100755 --- a/opac/opac-messaging.pl +++ b/opac/opac-messaging.pl @@ -28,7 +28,6 @@ use C4::Koha; use C4::Circulation; use C4::Output; use C4::Members; -use C4::Members::Messaging; use C4::Form::MessagingPreferences; use Koha::SMS::Providers; diff --git a/t/Members_Messaging.t b/t/Members_Messaging.t deleted file mode 100755 index 9395008..0000000 --- a/t/Members_Messaging.t +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/perl -# -# This Koha test module is a stub! -# Add more tests here!!! - -use strict; -use warnings; - -use Test::More tests => 1; - -BEGIN { - use_ok('C4::Members::Messaging'); -} - diff --git a/tools/import_borrowers.pl b/tools/import_borrowers.pl index 5db1adc..d779ae2 100755 --- a/tools/import_borrowers.pl +++ b/tools/import_borrowers.pl @@ -43,7 +43,6 @@ use C4::Context; use C4::Members; use C4::Members::Attributes qw(:all); use C4::Members::AttributeTypes; -use C4::Members::Messaging; use C4::Reports::Guided; use C4::Templates; use Koha::Patron::Debarments; -- 2.7.4