From 3a62fa3cc84424ebf528ee2f67b64ea00b363921 Mon Sep 17 00:00:00 2001
From: Mitch Jackson <mitch@freeside.biz>
Date: Tue, 23 Oct 2018 00:51:51 -0400
Subject: RT# 38217 Fix JS bug when creating an email notice

---
 httemplate/misc/delete-log_email.html | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'httemplate/misc/delete-log_email.html')

diff --git a/httemplate/misc/delete-log_email.html b/httemplate/misc/delete-log_email.html
index cc17b15a0..5a6bdc083 100644
--- a/httemplate/misc/delete-log_email.html
+++ b/httemplate/misc/delete-log_email.html
@@ -3,7 +3,7 @@
 % } else {
 <H1>Log email condition deleted</H1>
 <SCRIPT>
-window.top.location.reload();
+window.top.location = "<% $fsurl %>browse/log_email.html";
 </SCRIPT>
 % }
 
@@ -11,10 +11,12 @@ window.top.location.reload();
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right([ 'View system logs', 'Configuration' ]);
 
-my $logemailnum = $cgi->param('logemailnum');
-$logemailnum =~ /^\d+$/ or die "bad logemailnum '$logemailnum'";
-my $log_email = FS::log_email->by_key($logemailnum)
-  or die "logemailnum '$logemailnum' not found";
-my $error = $log_email->delete;
+  my $error;
+  my $logemailnum = $cgi->param('logemailnum');
+  if ( $logemailnum && $logemailnum =~ /^\d+$/ ) {
+    if ( my $log_email = FS::log_email->by_key( $logemailnum ) ) {
+      $error = $log_email->delete;
+    }
+  }
 </%init>
 
-- 
cgit v1.2.1