diff options
| -rwxr-xr-x | process_bug.cgi | 9 | ||||
| -rw-r--r-- | template/en/default/bug/process/midair.html.tmpl | 4 | ||||
| -rw-r--r-- | template/en/default/bug/process/results.html.tmpl | 4 |
3 files changed, 11 insertions, 6 deletions
diff --git a/process_bug.cgi b/process_bug.cgi index 856767381..642d5beb5 100755 --- a/process_bug.cgi +++ b/process_bug.cgi @@ -168,12 +168,6 @@ if ($::COOKIE{"BUGLIST"} && $::FORM{'id'}) { } } -# Start displaying the response page. -$template->process("bug/process/header.html.tmpl", $vars) - || ThrowTemplateError($template->error()); - -$vars->{'header_done'} = 1; - GetVersionTable(); CheckFormFieldDefined(\%::FORM, 'product'); @@ -1670,6 +1664,7 @@ foreach my $id (@idlist) { # receive email about the change. $template->process("bug/process/results.html.tmpl", $vars) || ThrowTemplateError($template->error()); + $vars->{'header_done'} = 1; if ($duplicate) { # Check to see if Reporter of this bug is reporter of Dupe @@ -1700,6 +1695,7 @@ foreach my $id (@idlist) { # Let the user know a duplication notation was added to the original bug. $template->process("bug/process/results.html.tmpl", $vars) || ThrowTemplateError($template->error()); + $vars->{'header_done'} = 1; } if ($check_dep_bugs) { @@ -1713,6 +1709,7 @@ foreach my $id (@idlist) { # bug and who did and didn't receive email about it. $template->process("bug/process/results.html.tmpl", $vars) || ThrowTemplateError($template->error()); + $vars->{'header_done'} = 1; } } } diff --git a/template/en/default/bug/process/midair.html.tmpl b/template/en/default/bug/process/midair.html.tmpl index 6305c11e4..85a5c1fff 100644 --- a/template/en/default/bug/process/midair.html.tmpl +++ b/template/en/default/bug/process/midair.html.tmpl @@ -34,6 +34,10 @@ # bug_id: number; the ID of the bug being changed. #%] +[% UNLESS header_done %] + [% PROCESS bug/process/header.html.tmpl %] +[% END %] + <h1>Mid-air collision detected!</h1> <p> diff --git a/template/en/default/bug/process/results.html.tmpl b/template/en/default/bug/process/results.html.tmpl index cc3e0df95..5c3592954 100644 --- a/template/en/default/bug/process/results.html.tmpl +++ b/template/en/default/bug/process/results.html.tmpl @@ -29,6 +29,10 @@ # mailrecipients: hash; BugMail recipient params. Optional. #%] +[% UNLESS header_done %] + [% PROCESS bug/process/header.html.tmpl %] +[% END %] + [% DEFAULT type="bug" %] [% |