From 0edb6050aeb65200869a12d83d8de794ed384154 Mon Sep 17 00:00:00 2001
From: Mitch Jackson <mitch@freeside.biz>
Date: Tue, 8 Jan 2019 17:19:02 -0500
Subject: RT# 38217 Improve delete button on log email page

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

(limited to 'httemplate/misc')

diff --git a/httemplate/misc/delete-log_email.html b/httemplate/misc/delete-log_email.html
index cc17b15a0..98b25e4c1 100644
--- a/httemplate/misc/delete-log_email.html
+++ b/httemplate/misc/delete-log_email.html
@@ -1,9 +1,15 @@
+<% include("/elements/header.html", 'Log email condition configuration') %>
+<P>
+  <A HREF="<% $p %>search/log.html">System Log</A>
+  | <a href="<% $p %>browse/log_email.html">Log E-Mail Condition</a>
+</p>
+
 % if ($error) {
 <P STYLE="color: red"><% $error %></P>
 % } else {
 <H1>Log email condition deleted</H1>
 <SCRIPT>
-window.top.location.reload();
+window.top.location = "<% $fsurl %>browse/log_email.html";
 </SCRIPT>
 % }
 
@@ -11,10 +17,17 @@ window.top.location.reload();
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right([ 'View system logs', 'Configuration' ]);
 
+my $error;
 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;
-</%init>
 
+if ( $logemailnum =~ /^\d+$/ ) {
+  if ( my $log_email = FS::log_email->by_key($logemailnum) ) {
+    $error = $log_email->delete;
+  } else {
+    $error = "logemailnum '$logemailnum' not found";
+  }
+} else {
+  $error = "bad logemailnum '$logemailnum'";
+}
+
+</%init>
-- 
cgit v1.2.1