diff options
| author | Jonathan Prykop <jonathan@freeside.biz> | 2016-06-17 00:31:09 -0500 |
|---|---|---|
| committer | Jonathan Prykop <jonathan@freeside.biz> | 2016-06-17 00:31:09 -0500 |
| commit | 00e8f9bf7f0382d8bd82c7e806bc79a1e0e89589 (patch) | |
| tree | 4b7b7ec5b416b713b8a2b5d878d292621a14a2cc /httemplate | |
| parent | b5f68a61dad0e3d00bab85716dc97bc186f55e48 (diff) | |
RT#39627: System log daily context also includes Cron::bill and Cron::upload results
Diffstat (limited to 'httemplate')
| -rw-r--r-- | httemplate/edit/log_email.html | 11 | ||||
| -rw-r--r-- | httemplate/search/log.html | 8 |
2 files changed, 18 insertions, 1 deletions
diff --git a/httemplate/edit/log_email.html b/httemplate/edit/log_email.html index 709a24069..0c98046d3 100644 --- a/httemplate/edit/log_email.html +++ b/httemplate/edit/log_email.html @@ -8,6 +8,12 @@ 'labels' => { '' => '(all)', map { $_ => $_ } @contexts }, 'curr_value' => scalar($cgi->param('context')), }, + { 'field' => 'context_height', + 'type' => 'checkbox', + 'postfix' => 'Only match most specific context', + 'value' => 1, + 'curr_value' => scalar($cgi->param('context_height')), + }, { 'field' => 'min_level', 'type' => 'select', 'options' => [ 0..7 ], @@ -24,6 +30,7 @@ ], 'labels' => { 'context' => 'Context', + 'context_height' => '', 'min_level' => 'Min. Level', 'to_addr' => 'To', 'msgnum' => 'Message', @@ -44,6 +51,10 @@ die "access denied" unless $FS::CurrentUser::CurrentUser->access_right([ 'View system logs', 'Configuration' ]); my $msgnum = $cgi->param('msgnum'); + +# XXX This attempt to set a default message isn't working, not sure why +# $msgnum gets set correctly, but isn't selected in the popup window...fix later + unless ($msgnum) { my ($msg_template) = qsearch('msg_template',{ msgname => 'System log' }); # doesn't seem worth having a config just for the default selected template diff --git a/httemplate/search/log.html b/httemplate/search/log.html index b607f505d..111200f55 100644 --- a/httemplate/search/log.html +++ b/httemplate/search/log.html @@ -101,6 +101,12 @@ a:visited {text-decoration: none} labels => { map {$_, $_} @contexts }, curr_value => ($cgi->param('context') || ''), &> + <BR><& /elements/checkbox.html, + 'field' => 'context_height', + 'postfix' => 'Only match most specific context', + 'value' => 1, + 'curr_value' => scalar($cgi->param('context_height')), + &> </TD> </TR> <TR> @@ -214,7 +220,7 @@ $cgi->param('max_level', 7) 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); } |