diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2018-10-28 13:23:32 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2018-10-28 13:23:32 -0700 |
| commit | 513d1c3cbbcb536acda260ffe121610fc9c1ed81 (patch) | |
| tree | 36f3f4af13d203ee75efaffdcbf014b8bec50bb2 /httemplate/edit | |
| parent | 74cdc73b9f0e6e1cdd7fd68e7fb2830bba4fdba0 (diff) | |
| parent | 03581a2d9d8cc76d3fb88cbc78da3128b137157a (diff) | |
Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE_3_BRANCH
Diffstat (limited to 'httemplate/edit')
| -rw-r--r-- | httemplate/edit/log_email.html | 11 | ||||
| -rw-r--r-- | httemplate/edit/msg_template.html | 6 |
2 files changed, 17 insertions, 0 deletions
diff --git a/httemplate/edit/log_email.html b/httemplate/edit/log_email.html index 19b415d4d..b79aba986 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' => [ &FS::Log::levelnums ], @@ -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/edit/msg_template.html b/httemplate/edit/msg_template.html index 0478a8066..17e9966de 100644 --- a/httemplate/edit/msg_template.html +++ b/httemplate/edit/msg_template.html @@ -305,6 +305,11 @@ my %substitutions = ( '$payinfo' => 'Card/account# (masked)', '$payinfo_end' => 'Card/account last 4 digits', ], + 'system_log' => [ + '$loglevel' => 'Log event severity level', + '$logcontext' => 'Log event context', + '$logmessage' => 'Log event message text' + ], ); tie my %sections, 'Tie::IxHash', ( @@ -319,6 +324,7 @@ tie my %sections, 'Tie::IxHash', ( 'svc_domain'=> 'Domain service fields', 'svc_phone' => 'Phone service fields', 'svc_broadband' => 'Broadband service fields', +'system_log' => 'System log fields', ); my $widget = new HTML::Widgets::SelectLayers( |