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

Bug 64562 - Redirect after attachment changes 

git-svn-id: svn://svn.office.custis.ru/3rdparty/bugzilla.org/trunk@1456 6955db30-a419-402b-8a0d-67ecbb4d7f56
master
vfilippov 2011-10-28 16:59:50 +00:00
parent 539a1cd1ca
commit 12f37591f3
2 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
attachment.cgi
View File

@ -156,7 +156,6 @@ sub validateID {
# prompt them with a page that allows them to choose an attachment.
# Happens when calling plain attachment.cgi from the urlbar directly
if ($param eq 'id' && !$cgi->param('id')) {
$cgi->send_header();
$template->process("attachment/choose.html.tmpl", $vars) ||
ThrowTemplateError($template->error());
exit;
@ -402,8 +401,6 @@ sub viewall {
$vars->{'bug'} = $bug;
$vars->{'attachments'} = $attachments;
$cgi->send_header();
# Generate and return the UI (HTML page) from the appropriate template.
$template->process("attachment/show-multiple.html.tmpl", $vars)
|| ThrowTemplateError($template->error());
@ -440,8 +437,6 @@ sub enter {
grep { $_->is_requestable && $_->is_requesteeble } @$flag_types;
$vars->{'token'} = issue_session_token('create_attachment:');
$cgi->send_header();
# Generate and return the UI (HTML page) from the appropriate template.
$template->process("attachment/create.html.tmpl", $vars)
|| ThrowTemplateError($template->error());
@ -476,7 +471,6 @@ sub insert {
if ($old_attach_id) {
$vars->{'bugid'} = $bugid;
$vars->{'attachid'} = $old_attach_id;
$cgi->send_header();
$template->process("attachment/cancel-create-dupe.html.tmpl", $vars)
|| ThrowTemplateError($template->error());
exit;
@ -635,8 +629,6 @@ sub edit {
$vars->{'attachment'} = $attachment;
$vars->{'attachments'} = $bugattachments;
$cgi->send_header();
# Generate and return the UI (HTML page) from the appropriate template.
$template->process("attachment/edit.html.tmpl", $vars)
|| ThrowTemplateError($template->error());
@ -683,7 +675,6 @@ sub update {
$cgi->param('delta_ts', $attachment->modification_time);
$vars->{'attachment'} = $attachment;
$cgi->send_header();
# Warn the user about the mid-air collision and ask them what to do.
$template->process("attachment/midair.html.tmpl", $vars)
|| ThrowTemplateError($template->error());
@ -734,18 +725,35 @@ sub update {
$vars->{'bugs'} = [$bug];
$vars->{'header_done'} = 1;
# TODO save this into session and redirect
my $sent = send_results({
my $send_results = send_results({
bug_id => $bug->id,
mailrecipients => { 'changer' => $user->login },
});
$vars->{$_} = $sent->{$_} for keys %$sent;
$vars->{$_} = $send_results->{$_} for keys %$send_results;
$cgi->send_header();
# Operation result to save into session (CustIS Bug 64562)
my $session_data = {
sent => [ $send_results ],
sent_attrs => {
changed_attachment => {
id => $attachment->id,
bug_id => $attachment->bug_id,
description => $attachment->description,
},
},
};
# Generate and return the UI (HTML page) from the appropriate template.
$template->process("attachment/updated.html.tmpl", $vars)
|| ThrowTemplateError($template->error());
if (Bugzilla->usage_mode != USAGE_MODE_EMAIL)
{
if (Bugzilla->save_session_data($session_data))
{
print $cgi->redirect(-location => 'show_bug.cgi?id='.$attachment->bug_id);
exit;
}
# Generate and return the UI (HTML page) from the appropriate template.
$template->process("attachment/updated.html.tmpl", $vars)
|| ThrowTemplateError($template->error());
}
}
# Only administrators can delete attachments.
@ -753,8 +761,6 @@ sub delete_attachment {
my $user = Bugzilla->login(LOGIN_REQUIRED);
my $dbh = Bugzilla->dbh;
$cgi->send_header();
$user->in_group('admin')
|| ThrowUserError('auth_failure', {group => 'admin',
action => 'delete',

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

@ -62,6 +62,16 @@
[% END %]
[% END %]
[% IF changed_attachment %]
[% SET title = "Changes Submitted to Attachment $changed_attachment.id of $terms.Bug $changed_attachment.bug_id" %]
<dl>
<dt>Changes to
<a href="attachment.cgi?id=[% changed_attachment.id %]&amp;action=edit">attachment [% changed_attachment.id %]</a>
of [% "$terms.bug $changed_attachment.bug_id" FILTER bug_link(changed_attachment.bug_id) FILTER none %] submitted
</dt>
</dl>
[% END %]
[% FOREACH item = sentmail %]
[% FOR k = item.keys; $k = item.$k; END %]
[% PROCESS bug/process/results.html.tmpl %]