summaryrefslogtreecommitdiff
path: root/httemplate
diff options
context:
space:
mode:
authorJonathan Prykop <jonathan@freeside.biz>2016-07-26 15:04:54 -0500
committerJonathan Prykop <jonathan@freeside.biz>2016-07-26 15:04:54 -0500
commita1930173f49200333e347b87c01c3edabc1ebb9c (patch)
treefeeca6ee320a76e6a303419622fc6ca2d23dd42c /httemplate
parentb307e9044cc1fded25280ea5d9e105daaba89d43 (diff)
Revert "RT#38217: Send email when logging conditions are met"
This reverts commit 5f563d5ac7e6e1e93cca382baa42ee106f3db5a0.
Diffstat (limited to 'httemplate')
-rw-r--r--httemplate/edit/log_email.html4
-rw-r--r--httemplate/search/log.html21
2 files changed, 14 insertions, 11 deletions
diff --git a/httemplate/edit/log_email.html b/httemplate/edit/log_email.html
index 4b7d09fb4..0c98046d3 100644
--- a/httemplate/edit/log_email.html
+++ b/httemplate/edit/log_email.html
@@ -16,8 +16,8 @@
},
{ 'field' => 'min_level',
'type' => 'select',
- 'options' => [ 0..4 ],
- 'labels' => { map {$_ => $FS::Log::LEVELS[$_]} 0..4 },
+ 'options' => [ 0..7 ],
+ 'labels' => { map {$_ => $FS::Log::LEVELS[$_]} 0..7 },
'curr_value' => scalar($cgi->param('min_level')),
},
'to_addr',
diff --git a/httemplate/search/log.html b/httemplate/search/log.html
index cefa399a2..111200f55 100644
--- a/httemplate/search/log.html
+++ b/httemplate/search/log.html
@@ -81,15 +81,15 @@ a:visited {text-decoration: none}
<TD>Level
<& /elements/select.html,
field => 'min_level',
- options => [ 0..4 ],
- labels => { map {$_ => $FS::Log::LEVELS[$_]} 0..4 },
+ options => [ 0..7 ],
+ labels => { map {$_ => $FS::Log::LEVELS[$_]} 0..7 },
curr_value => $cgi->param('min_level'),
&>
to
<& /elements/select.html,
field => 'max_level',
- options => [ 0..4 ],
- labels => { map {$_ => $FS::Log::LEVELS[$_]} 0..4 },
+ options => [ 0..7 ],
+ labels => { map {$_ => $FS::Log::LEVELS[$_]} 0..7 },
curr_value => $cgi->param('max_level'),
&>
</TD>
@@ -192,11 +192,14 @@ my $object_link_sub = sub {
};
my @colors = (
- '404040', #debug, gray
- '000000', #info, black
- '0000aa', #warning, blue
- 'aa0066', #error, purple
- 'ff0000', #critical, red
+ '404040', #debug
+ '0000aa', #info
+ '00aa00', #notice
+ 'aa0066', #warning
+ '000000', #error
+ 'aa0000', #critical
+ 'ff0000', #alert
+ 'ff0000', #emergency
);
my $color_sub = sub { $colors[ $_[0]->level ]; };