X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Flog.html;h=9be0b7d0a542343d437613ad125097b008c2cde2;hb=a218049cc9560b1bfc98f5803fba18f9f804e11b;hp=b607f505d14aaabc585e5379392c964615f59777;hpb=e1aa1019e11d7a73fcf90a87dd59c71ed90adce5;p=freeside.git
diff --git a/httemplate/search/log.html b/httemplate/search/log.html
index b607f505d..9be0b7d0a 100644
--- a/httemplate/search/log.html
+++ b/httemplate/search/log.html
@@ -65,14 +65,14 @@ a:visited {text-decoration: none}
From
<& /elements/input-date-field.html, {
- name => 'beginning',
- value => $cgi->param('beginning'),
+ name => 'beginning',
+ value => scalar($cgi->param('beginning')),
} &>
|
To
<& /elements/input-date-field.html, {
- name => 'ending',
- value => $cgi->param('ending') || '',
+ name => 'ending',
+ value => scalar($cgi->param('ending')) || '',
noinit => 1,
} &>
|
@@ -80,17 +80,17 @@ a:visited {text-decoration: none}
Level
<& /elements/select.html,
- field => 'min_level',
- options => [ 0..7 ],
- labels => { map {$_ => $FS::Log::LEVELS[$_]} 0..7 },
- curr_value => $cgi->param('min_level'),
+ field => 'min_level',
+ options => [ &FS::Log::levelnums ],
+ labels => { &FS::Log::levelmap },
+ curr_value => scalar($cgi->param('min_level')),
&>
to
<& /elements/select.html,
- field => 'max_level',
- options => [ 0..7 ],
- labels => { map {$_ => $FS::Log::LEVELS[$_]} 0..7 },
- curr_value => $cgi->param('max_level'),
+ field => 'max_level',
+ options => [ &FS::Log::levelnums ],
+ labels => { &FS::Log::levelmap },
+ curr_value => scalar($cgi->param('max_level')),
&>
|
@@ -101,6 +101,12 @@ a:visited {text-decoration: none}
labels => { map {$_, $_} @contexts },
curr_value => ($cgi->param('context') || ''),
&>
+ <& /elements/checkbox.html,
+ 'field' => 'context_height',
+ 'postfix' => 'Only match most specific context',
+ 'value' => 1,
+ 'curr_value' => scalar($cgi->param('context_height')),
+ &>
|
@@ -122,7 +128,7 @@ a:visited {text-decoration: none}
<%once>
my $date_sub = sub { time2str('%Y-%m-%d %T', $_[0]->_date) };
-my $level_sub = sub { $FS::Log::LEVELS[$_[0]->level] };
+my $level_sub = sub { $FS::Log::LEVELS{$_[0]->level} };
my $context_sub = sub {
my $log = shift;
@@ -185,20 +191,17 @@ my $object_link_sub = sub {
}
};
-my @colors = (
- '404040', #debug
- '0000aa', #info
- '00aa00', #notice
- 'aa0066', #warning
- '000000', #error
- 'aa0000', #critical
- 'ff0000', #alert
- 'ff0000', #emergency
+my %colors = (
+ 0 => '404040', #debug, gray
+ 1 => '000000', #info, black
+ 3 => '0000aa', #warning, blue
+ 4 => 'aa0066', #error, purple
+ 5 => 'ff0000', #critical, red
);
-my $color_sub = sub { $colors[ $_[0]->level ]; };
+my $color_sub = sub { $colors{ $_[0]->level }; };
-my @contexts = ('', sort FS::log_context->contexts);
+my @contexts = ('', FS::log_context->contexts);
%once>
<%init>
my $curuser = $FS::CurrentUser::CurrentUser;
@@ -206,15 +209,15 @@ die "access denied"
unless $curuser->access_right([ 'View system logs', 'Configuration' ]);
my @menubar = ();
-push @menubar, qq(Configure conditions for sending email when logging),
+push @menubar, qq(Configure conditions for sending email when logging);
$cgi->param('min_level', 0) unless defined($cgi->param('min_level'));
-$cgi->param('max_level', 7) unless defined($cgi->param('max_level'));
+$cgi->param('max_level', 5) unless defined($cgi->param('max_level'));
my %search = ();
$search{'date'} = [ FS::UI::Web::parse_beginning_ending($cgi) ];
$search{'level'} = [ $cgi->param('min_level'), $cgi->param('max_level') ];
-foreach my $param (qw(agentnum context tablename tablenum custnum message)) {
+foreach my $param (qw(agentnum context context_height tablename tablenum custnum message)) {
if ( $cgi->param($param) ) {
$search{$param} = $cgi->param($param);
}