From 01f4401b39b0426b4309fa2dbbe5ba0a2521139e Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Sun, 22 Mar 2026 16:08:17 -0500 Subject: [PATCH] Rework PG error/warning/debug message handling. The PG messages are now dealt with completely separately from the webwork2 general warning handling. Furthermore PG warnings and debug messages are separately dealt with. The PG `internal_debug_messages` are no longer dealt with at all. They are unnecessary and inappropriately named, and will be removed from PG. Also, handling of the warnings is now much more consistent in all of the different places that problems are rendered. In fact, they all use the new `templates/ContentGenerator/Base/problem_warning_and_debug_output.html.ep` template for this. All of this output is no longer wrapped in a `code` tag. That is the wrong thing for this. None of it is code. It also causes problems with https://github.com/openwebwork/pg/pull/1384. --- htdocs/js/System/system.scss | 7 -- lib/WeBWorK/ContentGenerator.pm | 6 +- lib/WeBWorK/ContentGenerator/GatewayQuiz.pm | 28 +++---- lib/WeBWorK/ContentGenerator/Problem.pm | 77 +------------------ lib/WeBWorK/ContentGenerator/ShowMeAnother.pm | 18 ----- lib/WeBWorK/Utils/Rendering.pm | 11 +-- lib/WebworkWebservice/RenderProblem.pm | 37 ++++----- .../Base/error_output.html.ep | 5 +- .../Base/feedback_macro_email.html.ep | 6 +- .../problem_warning_and_debug_output.html.ep | 34 ++++++++ .../Base/warning_output.html.ep | 10 +-- .../ContentGenerator/GatewayQuiz.html.ep | 14 ++++ templates/ContentGenerator/Problem.html.ep | 26 +++++++ templates/RPCRenderFormats/default.html.ep | 66 ++++------------ templates/layouts/system.html.ep | 2 +- 15 files changed, 140 insertions(+), 207 deletions(-) create mode 100644 templates/ContentGenerator/Base/problem_warning_and_debug_output.html.ep diff --git a/htdocs/js/System/system.scss b/htdocs/js/System/system.scss index 6894ccfc50..29d6276f95 100644 --- a/htdocs/js/System/system.scss +++ b/htdocs/js/System/system.scss @@ -374,13 +374,6 @@ h1.page-title { line-height: 1.4; } -.Warnings { - code { - white-space: normal; - color: inherit; - } -} - .error-output { word-wrap: break-word; color: #d63384; diff --git a/lib/WeBWorK/ContentGenerator.pm b/lib/WeBWorK/ContentGenerator.pm index e850cf039e..2bd7756686 100644 --- a/lib/WeBWorK/ContentGenerator.pm +++ b/lib/WeBWorK/ContentGenerator.pm @@ -813,7 +813,7 @@ there are pg errors. =cut sub have_warnings ($c) { - return $c->stash('warnings') || $c->{pgerrors}; + return $c->stash('warnings'); } =item exists_theme_file @@ -1220,8 +1220,8 @@ Used to display a generic warning message at the top of the page =cut sub warningMessage ($c) { - return $c->maketext('Warning: There may be something wrong with this question. ' - . 'Please inform your instructor including the warning messages below.'); + return $c->maketext('Warning: WeBWorK has encountered warnings while processing your request. ' + . 'See the warning messages below for details.'); } =item $string = formatDateTime($date_time, $format_string, $timezone, $locale) diff --git a/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm b/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm index 63f495a4d1..246ab07820 100644 --- a/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm +++ b/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm @@ -274,14 +274,15 @@ sub get_instructor_comment ($c, $problem) { async sub pre_header_initialize ($c) { # Make sure these are defined for the templates. - $c->stash->{problems} = []; - $c->stash->{pg_results} = []; - $c->stash->{startProb} = 0; - $c->stash->{endProb} = 0; - $c->stash->{numPages} = 0; - $c->stash->{pageNumber} = 0; - $c->stash->{problem_numbers} = []; - $c->stash->{probOrder} = []; + $c->stash->{problems} = []; + $c->stash->{pg_results} = []; + $c->stash->{startProb} = 0; + $c->stash->{endProb} = 0; + $c->stash->{numPages} = 0; + $c->stash->{pageNumber} = 0; + $c->stash->{problem_numbers} = []; + $c->stash->{probOrder} = []; + $c->stash->{haveProblemWarnings} = 0; # If authz->checkSet has failed, then this set is invalid. No need to proceeded. return if $c->{invalidSet}; @@ -1447,11 +1448,6 @@ sub nav ($c, $args) { return ''; } -sub warningMessage ($c) { - return $c->maketext('Warning: There may be something wrong with a question in this test. ' - . 'Please inform your instructor including the warning messages below.'); -} - # Evaluation utility # $effectiveUser is the current effective user, $set is the merged set version, $formFields is a reference to the # hash of parameters from the input form that need to be passed to the translator, and $mergedProblem @@ -1510,16 +1506,14 @@ async sub getProblemHTML ($c, $effectiveUser, $set, $formFields, $mergedProblem) }, ); - # Warnings in the renderPG subprocess will not be caught by the global warning handler of this process. - # So rewarn them and let the global warning handler take care of it. - warn $pg->{warnings} if $pg->{warnings}; - # If the user can check answers and either this is not an answer submission or the problem_data form # parameter was previously set, then set or update the problem_data form parameter. $c->param('problem_data_' . $mergedProblem->problem_id => encode_json($pg->{PERSISTENCE_HASH} || '{}')) if $c->{can}{checkAnswers} && (!$c->{submitAnswers} || defined $c->param('problem_data_' . $mergedProblem->problem_id)); + $c->stash->{haveProblemWarnings} = 1 if $pg->{warnings} || @{ $pg->{pgwarning} // [] }; + return $pg; } diff --git a/lib/WeBWorK/ContentGenerator/Problem.pm b/lib/WeBWorK/ContentGenerator/Problem.pm index 321ebb6840..ac08c1ff0e 100644 --- a/lib/WeBWorK/ContentGenerator/Problem.pm +++ b/lib/WeBWorK/ContentGenerator/Problem.pm @@ -594,10 +594,6 @@ async sub pre_header_initialize ($c) { } ); - # Warnings in the renderPG subprocess will not be caught by the global warning handler of this process. - # So rewarn them and let the global warning handler take care of it. - warn $pg->{warnings} if $pg->{warnings}; - debug('end pg processing'); $pg->{body_text} .= $c->hidden_field( @@ -609,20 +605,6 @@ async sub pre_header_initialize ($c) { $can{showHints} &&= $pg->{flags}{hintExists}; $can{showSolutions} &&= $pg->{flags}{solutionExists}; - # Record errors - $c->{pgdebug} = $pg->{debug_messages} if ref $pg->{debug_messages} eq 'ARRAY'; - $c->{pgwarning} = $pg->{warning_messages} if ref $pg->{warning_messages} eq 'ARRAY'; - $c->{pginternalerrors} = $pg->{internal_debug_messages} if ref $pg->{internal_debug_messages} eq 'ARRAY'; - # $c->{pgerrors} is defined if any of the above are defined, and is nonzero if any are non-empty. - $c->{pgerrors} = @{ $c->{pgdebug} // [] } || @{ $c->{pgwarning} // [] } || @{ $c->{pginternalerrors} // [] } - if defined $c->{pgdebug} || defined $c->{pgwarning} || defined $c->{pginternalerrors}; - - # If $c->{pgerrors} is not defined, then the PG messages arrays were not defined, - # which means $pg->{pgcore} was not defined and the translator died. - warn 'Processing of this PG problem was not completed. Probably because of a syntax error. ' - . 'The translator died prematurely and no PG warning messages were transmitted.' - unless defined $c->{pgerrors}; - # Store fields $c->{want} = \%want; $c->{can} = \%can; @@ -635,53 +617,6 @@ async sub pre_header_initialize ($c) { return; } -sub warnings ($c) { - my $output = $c->c; - - # Display warning messages - if (!defined $c->{pgerrors}) { - push( - @$output, - $c->tag( - 'div', - $c->c( - $c->tag('h3', style => 'color:red;', $c->maketext('PG question failed to render')), - $c->tag('p', $c->maketext('Unable to obtain error messages from within the PG question.')) - )->join('') - ) - ); - } elsif ($c->{pgerrors} > 0) { - my @pgdebug = @{ $c->{pgdebug} // [] }; - my @pgwarning = @{ $c->{pgwarning} // [] }; - my @pginternalerrors = @{ $c->{pginternalerrors} // [] }; - push( - @$output, - $c->tag( - 'div', - $c->c( - $c->tag('h2', $c->maketext('PG question processing error messages')), - @pgdebug ? $c->c( - $c->tag('h3', $c->maketext('PG debug messages')), - $c->tag('p', $c->c(@pgdebug)->join($c->tag('br'))) - )->join('') : '', - @pgwarning ? $c->c( - $c->tag('h3', $c->maketext('PG warning messages')), - $c->tag('p', $c->c(@pgwarning)->join($c->tag('br'))) - )->join('') : '', - @pginternalerrors ? $c->c( - $c->tag('h3', $c->maketext('PG internal errors')), - $c->tag('p', $c->c(@pginternalerrors)->join($c->tag('br'))) - )->join('') : '' - )->join('') - ) - ); - } - - push(@$output, $c->SUPER::warnings()); - - return $output->join(''); -} - sub head ($c) { return '' if ($c->{invalidSet}); return $c->{pg}{head_text} if $c->{pg}{head_text}; @@ -1042,14 +977,7 @@ sub output_problem_body ($c) { } else { # For students render the body text of the problem with a message about error details. return $c->c( - $c->tag( - 'div', - id => 'output_problem_body', - class => 'text-dark', - style => 'color-scheme: light', - data => { bs_theme => 'light' }, - $c->b($c->{pg}{body_text}) - ), + $c->tag('div', $c->b($c->{pg}{body_text})), $c->include( 'ContentGenerator/Base/error_output', error => $c->{pg}{errors}, @@ -1534,7 +1462,8 @@ sub output_past_answer_button ($c) { $c->hidden_field(selected_sets => $c->{problem}->set_id), $c->hidden_field(selected_users => $c->{problem}->user_id), $c->tag( - 'p', + 'div', + class => 'mb-3', $c->submit_button( $c->maketext('Show Past Answers'), name => 'action', diff --git a/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm b/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm index 8ae1f1d655..3dc0c76b31 100644 --- a/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm +++ b/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm @@ -212,30 +212,12 @@ async sub pre_header_initialize ($c) { } ); - # Warnings in the renderPG subprocess will not be caught by the global warning handler of this process. - # So rewarn them and let the global warning handler take care of it. - warn $pg->{warnings} if $pg->{warnings}; - debug('end pg processing'); # Update and fix hint/solution options after PG processing $c->{can}{showHints} &&= $pg->{flags}{hintExists}; $c->{can}{showSolutions} &&= $pg->{flags}{solutionExists}; - # Record errors - $c->{pgdebug} = $pg->{debug_messages} if ref $pg->{debug_messages} eq 'ARRAY'; - $c->{pgwarning} = $pg->{warning_messages} if ref $pg->{warning_messages} eq 'ARRAY'; - $c->{pginternalerrors} = $pg->{internal_debug_messages} if ref $pg->{internal_debug_messages} eq 'ARRAY'; - # $c->{pgerrors} is defined if any of the above are defined, and is nonzero if any are non-empty. - $c->{pgerrors} = @{ $c->{pgdebug} // [] } || @{ $c->{pgwarning} // [] } || @{ $c->{pginternalerrors} // [] } - if defined $c->{pgdebug} || defined $c->{pgwarning} || defined $c->{pginternalerrors}; - - # If $c->{pgerrors} is not defined, then the PG messages arrays were not defined, - # which means $pg->{pgcore} was not defined and the translator died. - warn 'Processing of this PG problem was not completed. Probably because of a syntax error. ' - . 'The translator died prematurely and no PG warning messages were transmitted.' - unless defined $c->{pgerrors}; - $c->{pg} = $pg; return; diff --git a/lib/WeBWorK/Utils/Rendering.pm b/lib/WeBWorK/Utils/Rendering.pm index 21f349b06a..91d30406e2 100644 --- a/lib/WeBWorK/Utils/Rendering.pm +++ b/lib/WeBWorK/Utils/Rendering.pm @@ -252,10 +252,9 @@ sub renderPG ($c, $effectiveUser, $set, $problem, $psvn, $formFields, $translati }; if (ref($pg->{pgcore}) eq 'PGcore') { - $ret->{internal_debug_messages} = $pg->{pgcore}->get_internal_debug_messages; - $ret->{warning_messages} = $pg->{pgcore}->get_warning_messages(); - $ret->{debug_messages} = $pg->{pgcore}->get_debug_messages(); - $ret->{PG_ANSWERS_HASH} = { + $ret->{warning_messages} = $pg->{pgcore}->get_warning_messages(); + $ret->{debug_messages} = $pg->{pgcore}->get_debug_messages(); + $ret->{PG_ANSWERS_HASH} = { map { $_ => { response_obj => unbless($pg->{pgcore}{PG_ANSWERS_HASH}{$_}->response_obj), @@ -269,6 +268,8 @@ sub renderPG ($c, $effectiveUser, $set, $problem, $psvn, $formFields, $translati keys %{ $pg->{pgcore}{PG_alias}{resource_list} } }; $ret->{PERSISTENCE_HASH} = $pg->{pgcore}{PERSISTENCE_HASH}; + } else { + $ret->{render_fail} = 1; } # Save the problem source. This is used by Caliper::Entity. Why? @@ -277,7 +278,7 @@ sub renderPG ($c, $effectiveUser, $set, $problem, $psvn, $formFields, $translati $pg->free; return $ret; })->catch(sub ($err) { - return { body_text => '', answers => {}, flags => { error_flag => 1 }, errors => $err }; + return { body_text => '', answers => {}, render_fail => 1, flags => { error_flag => 1 }, errors => $err }; }); } diff --git a/lib/WebworkWebservice/RenderProblem.pm b/lib/WebworkWebservice/RenderProblem.pm index 0f30a8606c..08d8ec4c91 100644 --- a/lib/WebworkWebservice/RenderProblem.pm +++ b/lib/WebworkWebservice/RenderProblem.pm @@ -258,26 +258,23 @@ async sub renderProblem { # New version of output: return { - text => $pg->{body_text}, - header_text => $pg->{head_text}, - post_header_text => $pg->{post_header_text}, - answers => $pg->{answers}, - errors => $pg->{errors}, - pg_warnings => $pg->{warnings}, - PG_ANSWERS_HASH => $pg->{PG_ANSWERS_HASH}, - PERSISTENCE_HASH => $pg->{PERSISTENCE_HASH}, - problem_result => $pg->{result}, - problem_state => $pg->{state}, - flags => $pg->{flags}, - psvn => $psvn, - problem_seed => $problemSeed, - resource_list => $pg->{resource_list}, - warning_messages => ref $pg->{warning_messages} eq 'ARRAY' ? $pg->{warning_messages} : [], - debug_messages => ref $pg->{debug_messages} eq 'ARRAY' ? $pg->{debug_messages} : [], - internal_debug_messages => ref $pg->{internal_debug_messages} eq 'ARRAY' - ? $pg->{internal_debug_messages} - : [], - compute_time => logTimingInfo($beginTime, Benchmark->new), + text => $pg->{body_text}, + header_text => $pg->{head_text}, + post_header_text => $pg->{post_header_text}, + answers => $pg->{answers}, + errors => $pg->{errors}, + pg_warnings => $pg->{warnings}, + PG_ANSWERS_HASH => $pg->{PG_ANSWERS_HASH}, + PERSISTENCE_HASH => $pg->{PERSISTENCE_HASH}, + problem_result => $pg->{result}, + problem_state => $pg->{state}, + flags => $pg->{flags}, + psvn => $psvn, + problem_seed => $problemSeed, + resource_list => $pg->{resource_list}, + warning_messages => ref $pg->{warning_messages} eq 'ARRAY' ? $pg->{warning_messages} : [], + debug_messages => ref $pg->{debug_messages} eq 'ARRAY' ? $pg->{debug_messages} : [], + compute_time => logTimingInfo($beginTime, Benchmark->new), }; } diff --git a/templates/ContentGenerator/Base/error_output.html.ep b/templates/ContentGenerator/Base/error_output.html.ep index 3285925a59..5533a7f94d 100644 --- a/templates/ContentGenerator/Base/error_output.html.ep +++ b/templates/ContentGenerator/Base/error_output.html.ep @@ -5,9 +5,8 @@ % }

<%= maketext( - 'WeBWorK has encountered a software error while attempting to process this problem. It is likely that ' - . 'there is an error in the problem itself. If you are a student, report this error message to your ' - . 'professor to have it corrected. If you are a professor, please consult the error output below for ' + 'WeBWorK has encountered a software error. If you are a student, report this error message to your ' + . 'instructor to have it corrected. If you are a instructor, please consult the error output below for ' . 'more information.' ) %>

diff --git a/templates/ContentGenerator/Base/feedback_macro_email.html.ep b/templates/ContentGenerator/Base/feedback_macro_email.html.ep index 2c9d5a8b7a..3d5f6f2a62 100644 --- a/templates/ContentGenerator/Base/feedback_macro_email.html.ep +++ b/templates/ContentGenerator/Base/feedback_macro_email.html.ep @@ -6,6 +6,8 @@ % next if $key eq 'pg_object'; # Not used in internal feedback mechanism <%= hidden_field $key => $value =%> % } - <%= submit_button maketext($ce->{feedback_button_name}) || maketext('Email instructor'), - name => 'feedbackForm', class => 'btn btn-primary' =%> +
+ <%= submit_button maketext($ce->{feedback_button_name}) || maketext('Email instructor'), + name => 'feedbackForm', class => 'btn btn-primary' =%> +
% end diff --git a/templates/ContentGenerator/Base/problem_warning_and_debug_output.html.ep b/templates/ContentGenerator/Base/problem_warning_and_debug_output.html.ep new file mode 100644 index 0000000000..9faf5184c0 --- /dev/null +++ b/templates/ContentGenerator/Base/problem_warning_and_debug_output.html.ep @@ -0,0 +1,34 @@ +% if ($warnings) { +
+
+

<%= maketext('PG warning messages') %>

+
    + % for (split m/\n+/, $warnings) { +
  • <%== $_ %>
    • + % } +
+
+
+% } +% if (@$warning_messages) { +
+
+

<%= maketext('PG processing warning messages') %>

+
    + % for (@$warning_messages) { +
  • <%== $_ %>
    • + % } +
+
+
+% } +% if (@$debug_messages) { +
+
+

<%= maketext('PG debug messages') %>

+ % for (@$debug_messages) { +
<%== $_ %>
+ % } +
+
+% } diff --git a/templates/ContentGenerator/Base/warning_output.html.ep b/templates/ContentGenerator/Base/warning_output.html.ep index ace4b696a5..f51c5935da 100644 --- a/templates/ContentGenerator/Base/warning_output.html.ep +++ b/templates/ContentGenerator/Base/warning_output.html.ep @@ -3,17 +3,15 @@

<%= maketext('WeBWorK Warnings') %>

<%= maketext( - 'WeBWorK has encountered warnings while processing your request. If this occurred when viewing ' - . 'a problem, it was likely caused by an error or ambiguity in that problem. Otherwise, it may indicate ' - . 'a problem with the WeBWorK system itself. If you are a student, report these warnings to your ' - . 'professor to have them corrected. If you are a professor, please consult the warning output below ' - . 'for more information.' + 'WeBWorK has encountered warnings while processing your request. This indicates a problem with the WeBWorK ' + . 'system. If you are a student, report these warnings to your instructor to have them corrected. If you ' + . 'are a instructor, please consult the warning output below for more information.' ) %>

<%= maketext('Warning messages') %>

<%= maketext('Request information') %>

diff --git a/templates/ContentGenerator/GatewayQuiz.html.ep b/templates/ContentGenerator/GatewayQuiz.html.ep index 09bc579c1f..244bdbcd38 100644 --- a/templates/ContentGenerator/GatewayQuiz.html.ep +++ b/templates/ContentGenerator/GatewayQuiz.html.ep @@ -388,6 +388,15 @@ % # Problems can be shown, so output the main form and the problems. % my $startTime = param('startTime') || time; % + % if ($haveProblemWarnings) { +
+
+ <%== maketext('Warning: There may be something wrong with a problem in this test. ' + . 'Please inform your instructor including the warning messages below the problem.') =%> +
+
+ % } + % <%= form_for $action, name => 'gwquiz', method => 'POST', class => 'problem-main-form mt-0', begin =%> <%= $c->hidden_authen_fields =%> <%= hidden_field courseID => $ce->{courseName} =%> @@ -649,6 +658,11 @@ <%= WeBWorK::HTML::SingleProblemGrader->new($c, $pg, $problems->[ $probOrder->[$i] ], $c->{set}) ->insertGrader =%> % } + % # Show warnings for the problem if there are any. + <%= include 'ContentGenerator/Base/problem_warning_and_debug_output', + warnings => $pg->{warnings}, + warning_messages => ref $pg->{warning_messages} eq 'ARRAY' ? $pg->{warning_messages} : [], + debug_messages => ref $pg->{debug_messages} eq 'ARRAY' ? $pg->{debug_messages} : [] =%> % # Store the problem status for continued attempts recording. <%= hidden_field 'probstatus' . $problems->[ $probOrder->[$i] ]{problem_id} diff --git a/templates/ContentGenerator/Problem.html.ep b/templates/ContentGenerator/Problem.html.ep index c36a3a68e0..d79cbb165d 100644 --- a/templates/ContentGenerator/Problem.html.ep +++ b/templates/ContentGenerator/Problem.html.ep @@ -65,12 +65,34 @@ % stash->{footerWidthClass} = 'col-lg-10'; % <%== $c->post_header_text =%> +% if ($c->{pg}{warnings} || @{ $c->{pgwarning} // [] }) { +
+
+ <%== maketext('Warning: There may be something wrong with this question. ' + . 'Please inform your instructor including the warning messages below.') =%> +
+
+% } +% if (ref $c->{pg}{debug_messages} eq 'ARRAY' && @{ $c->{pg}{debug_messages} }) { +
+
<%== maketext('Debugging information is shown below.') %>
+
+% }
<%= $c->output_custom_edit_message %>
<%= $c->output_summary %>
<%= $c->output_achievement_message %>
<%= $c->output_comments %>
+% if ($c->{pg}{render_fail}) { +
+
+

<%= maketext('PG question failed to render') %>

+

<%= maketext('Processing of this PG problem was not completed. Probably because of a ' + . 'syntax error. The translator died prematurely and no PG warning messages were transmitted.') %>

+
+
+% }
<%= form_for current_route, method => 'POST', name => 'problemMainForm', @@ -96,3 +118,7 @@ <%= $c->output_past_answer_button =%> <%= $c->output_email_instructor =%>
+<%= include 'ContentGenerator/Base/problem_warning_and_debug_output', + warnings => $c->{pg}{warnings}, + warning_messages => ref $c->{pg}{warning_messages} eq 'ARRAY' ? $c->{pg}{warning_messages} : [], + debug_messages => ref $c->{pg}{debug_messages} eq 'ARRAY' ? $c->{pg}{debug_messages} : [] =%> diff --git a/templates/RPCRenderFormats/default.html.ep b/templates/RPCRenderFormats/default.html.ep index 0e4b83f0df..a18a17cd40 100644 --- a/templates/RPCRenderFormats/default.html.ep +++ b/templates/RPCRenderFormats/default.html.ep @@ -136,64 +136,28 @@ % end
- % # PG warning messages (this includes translator warnings but not translator errors). - % if ($rh_result->{pg_warnings}) { -
-

<%= $lh->maketext('Warning messages') %>

- -
- % } - % # PG warning messages generated with WARN_message. - % if (ref $rh_result->{warning_messages} eq 'ARRAY' && @{ $rh_result->{warning_messages} }) { -
-

<%= $lh->maketext('PG warning messages') %>

- -
- % } - % # Translator errors. - % if ($rh_result->{flags}{error_flag}) { -
-

Translator errors

- <%== $rh_result->{errors} %> -
- % } + <%= include 'ContentGenerator/Base/problem_warning_and_debug_output', + warnings => $rh_result->{pg_warnings}, + warning_messages => ref $rh_result->{warning_messages} eq 'ARRAY' ? $rh_result->{warning_messages} : [], + debug_messages => + $formatName eq 'debug' && ref $rh_result->{debug_messages} eq 'ARRAY' + ? $rh_result->{debug_messages} + : [] + =%> % # Additional information output only for the debug format. % if ($formatName eq 'debug') { - % # PG debug messages generated with DEBUG_message. - % if (@{ $rh_result->{debug_messages} }) { -
-

PG debug messages

- -
- % } - % # Internal debug messages generated within PGcore. - % if (ref $rh_result->{internal_debug_messages} eq 'ARRAY' && @{ $rh_result->{internal_debug_messages} }) { -
-

Internal errors

- -
- % } % if ($ws->{inputs_ref}{clientDebug}) {

Webwork client data

%== $pretty_print->($ws) % } % } + % # Translator errors. + % if ($rh_result->{flags}{error_flag}) { +
+

Translator errors

+
<%== $rh_result->{errors} %>
+
+ % } % # Show the footer unless it is explicity disabled. % if ($showFooter ne '0') { diff --git a/templates/layouts/system.html.ep b/templates/layouts/system.html.ep index ba838025ab..ff39da58ab 100644 --- a/templates/layouts/system.html.ep +++ b/templates/layouts/system.html.ep @@ -189,7 +189,7 @@ % % if ($c->have_warnings) { -
<%= $c->warnings %>
+
<%= $c->warnings %>
% } % if ($c->can('message')) {
<%= $c->message %>