From a02c25d75cfc738833a79b5060a1a9ee972de37f Mon Sep 17 00:00:00 2001 From: Indranil Das Gupta Date: Thu, 21 May 2015 06:45:27 +0530 Subject: [PATCH] Bug 14206 Adds delete function for non email templates This patch adds deletion capability for notices that do not use email template, but uses any/all of the other templates i.e. sms, print or phone. Test plan (Continued) ===================== 3/ Go to Tools -> Notices & Slips. Add a new notice only for print, leave 'Library' and 'Koha module' options as default selections. Enter 'KOHA_14206' and 'Koha Test 14206' against Code and Name respectively, and 'Test' and 'Test Message' for subject and body. Leave the Email, Phone and SMS tabs blank. Save the notice. 4/ On the notices listing page the new notice will be listed. Try to delete it. It will load the 'Delete notice' dialog form, but the table will not show any data under s - 'Library', 'Module', 'Code' or 'Name'. 5/ Click the "Yes, delete" button. The page will be submitted and the Notices listing reloaded. The print-only KOHA_14206 notice should continue to exist. This is *wrong*. 6/ Apply this patch 7/ Reload the listings page and click on the 'Delete' link for Notice KOHA_14206. This time, it should show the data under 'Module', 'Code' or 'Name' at least. 8/ Click on 'Yes, delete'. The page should submit and the listing page reload. This time KOHA_14206 will be gone. 9/ Re-run prove -v t/db_dependent/Letters.t This time all tests should PASS without any error. --- C4/Letters.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/C4/Letters.pm b/C4/Letters.pm index c7751ca..b1b7d4b 100644 --- a/C4/Letters.pm +++ b/C4/Letters.pm @@ -207,8 +207,7 @@ sub GetLettersAvailableForALibrary { our %letter; sub getletter { my ( $module, $code, $branchcode, $message_transport_type ) = @_; - $message_transport_type ||= 'email'; - + $message_transport_type //= '%'; if ( C4::Context->preference('IndependentBranches') and $branchcode @@ -226,8 +225,8 @@ sub getletter { my $sth = $dbh->prepare(q{ SELECT * FROM letter - WHERE module=? AND code=? AND (branchcode = ? OR branchcode = '') AND message_transport_type = ? - ORDER BY branchcode DESC LIMIT 1 + WHERE module=? AND code=? AND (branchcode = ? OR branchcode = '') + AND message_transport_type LIKE ? }); $sth->execute( $module, $code, $branchcode, $message_transport_type ); my $line = $sth->fetchrow_hashref @@ -237,6 +236,7 @@ sub getletter { return { %$line }; } + =head2 DelLetter DelLetter( -- 1.9.1