Skip to content

Drop post_header_text support (pg content added by POST_HEADER_TEXT). #3198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
drgrice1 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Drop post_header_text support (pg content added by POST_HEADER_TEXT). #3198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions lib/WeBWorK/ContentGenerator/Problem.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,12 +617,6 @@ sub head ($c) {
return '';
}

sub post_header_text ($c) {
return '' if ($c->{invalidSet});
return $c->{pg}->{post_header_text} if $c->{pg}->{post_header_text};
return '';
}

sub siblings ($c) {
my $db = $c->db;
my $ce = $c->ce;
Expand Down
1 change: 0 additions & 1 deletion lib/WeBWorK/ContentGenerator/RenderViaRPC.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,6 @@ async sub renderProblem ($c) {
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},
Expand Down
17 changes: 8 additions & 9 deletions lib/WeBWorK/Utils/Rendering.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,15 +239,14 @@ sub renderPG ($c, $effectiveUser, $set, $problem, $psvn, $formFields, $translati
$c->ce, $effectiveUser, $set, $problem, $psvn, $formFields, $translationOptions));

my $ret = {
body_text => $pg->{body_text},
head_text => $pg->{head_text},
post_header_text => $pg->{post_header_text},
answers => unbless($pg->{answers}),
errors => $pg->{errors},
warnings => $pg->{warnings},
result => $pg->{result},
state => $pg->{state},
flags => $pg->{flags},
body_text => $pg->{body_text},
head_text => $pg->{head_text},
answers => unbless($pg->{answers}),
errors => $pg->{errors},
warnings => $pg->{warnings},
result => $pg->{result},
state => $pg->{state},
flags => $pg->{flags},
};

if (ref($pg->{pgcore}) eq 'PGcore') {
Expand Down
1 change: 0 additions & 1 deletion templates/ContentGenerator/Problem.html.ep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@
%
% stash->{footerWidthClass} = 'col-lg-10';
%
<%== $c->post_header_text =%>
% if ($c->{pg}{warnings} || @{ $c->{pg}{warning_messages} // [] }) {
<div class="row g-0 mb-2">
<div class="col-12 alert alert-danger m-0">
Expand Down
1 change: 0 additions & 1 deletion templates/RPCRenderFormats/default.html.ep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
%= javascript $_->{file}, %{ $_->{attributes} }
% }
%== $rh_result->{header_text} // ''
%== $rh_result->{post_header_text} // ''
%== $extra_header_text
</head>
<body>
Expand Down
1 change: 0 additions & 1 deletion templates/RPCRenderFormats/default.json.ep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
% (map { javascript($_->[0], %{ $_->[1] // {} }) } @$third_party_js),
% (map { javascript($_->{file}, %{ $_->{attributes} }) } @$extra_js_files),
% $rh_result->{header_text} // '',
% $rh_result->{post_header_text} // '',
% $extra_header_text
% ),
% head_part400 => '<title>WeBWorK problem</title>',
Expand Down