vitalif
/
bugzilla-4intranet
mirror of https://github.com/vitalif/bugzilla-4intranet
1
0
Fork 0
Code Issues Releases Wiki Activity

Bug 64562 - Fix headers (for test compatibility) and mass editing 

git-svn-id: svn://svn.office.custis.ru/3rdparty/bugzilla.org/trunk@778 6955db30-a419-402b-8a0d-67ecbb4d7f56
master
vfilippov 2010-06-07 16:24:18 +00:00
parent ba089dae46
commit 697aa9a3f0
4 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
post_bug.cgi
View File

@ -316,7 +316,9 @@ $vars->{sentmail} = \@all_mail_results;
if (Bugzilla->usage_mode != USAGE_MODE_EMAIL) if (Bugzilla->usage_mode != USAGE_MODE_EMAIL)
{ {
if (Bugzilla->save_session_data({ sent => \@all_mail_results })) my $title = template_var('terms')->{Bug}.' '.$bug->id.' Submitted – '.$bug->short_desc;
my $header = template_var('terms')->{Bug}.' '.$bug->id.' Submitted';
if (Bugzilla->save_session_data({ sent => \@all_mail_results, title => $title, header => $header }))
{ {
print $cgi->redirect(-location => 'show_bug.cgi?id='.$bug->id); print $cgi->redirect(-location => 'show_bug.cgi?id='.$bug->id);
} }

12
process_bug.cgi
View File

@ -720,7 +720,16 @@ elsif (($action eq 'next_bug' or $action eq 'same_bug') && ($bug = $vars->{bug})
$vars->{'bug'} = $bug; $vars->{'bug'} = $bug;
} }
# Do redirect and exit # Do redirect and exit
if (Bugzilla->save_session_data({ sent => $send_results })) my $title;
if (scalar(@bug_objects) == 1)
{
$title = template_var('terms')->{Bug} . ' ' . $bug->id . ' processed';
}
else
{
$title = template_var('terms')->{Bugs} . ' processed';
}
if (Bugzilla->save_session_data({ sent => $send_results, title => $title }))
{ {
print $cgi->redirect(-location => 'show_bug.cgi?id='.$bug->id); print $cgi->redirect(-location => 'show_bug.cgi?id='.$bug->id);
exit; exit;
@ -739,6 +748,7 @@ unless (Bugzilla->usage_mode == USAGE_MODE_EMAIL)
{ {
$template->process("bug/process/results.html.tmpl", { %$vars, %$_ }) $template->process("bug/process/results.html.tmpl", { %$vars, %$_ })
|| ThrowTemplateError($template->error()); || ThrowTemplateError($template->error());
$vars->{header_done} = 1;
} }
$template->process("bug/navigate.html.tmpl", $vars) $template->process("bug/navigate.html.tmpl", $vars)
|| ThrowTemplateError($template->error()); || ThrowTemplateError($template->error());

4
show_bug.cgi
View File

@ -126,7 +126,9 @@ $vars->{'displayfields'} = \%displayfields;
my $sd; my $sd;
if (Bugzilla->session && ($sd = Bugzilla->session_data) && $sd->{sent}) if (Bugzilla->session && ($sd = Bugzilla->session_data) && $sd->{sent})
{ {
Bugzilla->save_session_data({ sent => undef, finish => undef }); Bugzilla->save_session_data({ sent => undef, title => undef, header => undef });
$vars->{last_title} = $sd->{title};
$vars->{last_header} = $sd->{header};
$vars->{sentmail} = $sd->{sent}; $vars->{sentmail} = $sd->{sent};
} }

6
template/en/default/bug/show.html.tmpl
View File

@ -28,6 +28,12 @@
[% IF !header_done %] [% IF !header_done %]
[% PROCESS "bug/show-header.html.tmpl" %] [% PROCESS "bug/show-header.html.tmpl" %]
[% IF last_title;
SET title = last_title;
END;
IF last_header;
SET header = last_header;
END %]
[% PROCESS global/header.html.tmpl %] [% PROCESS global/header.html.tmpl %]
[% END %] [% END %]