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

Fix "Show Multiple" (long format)

master
Vitaliy Filippov 2014-05-07 15:51:35 +04:00
parent 9c2d4ba334
commit b802359320
3 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Bugzilla/Bug.pm
View File

@ -2713,6 +2713,12 @@ sub classification_id
return $self->product_obj && $self->product_obj->classification_id;
}
sub classification_obj
{
my ($self) = @_;
return $self->product_obj && $self->product_obj->classification_obj;
}
sub classification
{
my ($self) = @_;

11
show_bug.cgi
View File

@ -84,6 +84,7 @@ if ($single)
}
else
{
my @errors;
foreach my $id (@{$ARGS->{id}})
{
# Be kind enough and accept URLs of the form: id=1,2,3.
@ -98,9 +99,17 @@ else
{
$bug = { bug_id => $bug->bug_id, error => 'NotPermitted' };
}
push @bugs, $bug;
if ($bug->{error})
{
push @errors, $bug;
}
else
{
push @bugs, $bug;
}
}
}
$vars->{error_bugs} = \@errors;
}
$vars->{bugs} = \@bugs;

20
template/en/default/bug/show-multiple.html.tmpl
View File

@ -35,9 +35,13 @@
[% PROCESS bug/time.html.tmpl %]
[% IF bugs.first %]
[% ids = [] %]
[% FOREACH bug = error_bugs %]
[% PROCESS bug_display error=1 %]
[% ids.push(bug.bug_id) %]
[% END %]
[% FOREACH bug = bugs %]
[% PROCESS bug_display %]
[% ids.push(bug.bug_id) UNLESS bug.error %]
[% PROCESS bug_display error=0 %]
[% ids.push(bug.bug_id) %]
[% END %]
[% IF ids.size > 1 %]
<div class="bz_query_buttons">
@ -62,14 +66,14 @@
[% BLOCK bug_display %]
<h1>
[% terms.Bug %] <a href="show_bug.cgi?id=[% bug.bug_id | html %]">[% bug.bug_id | html %]</a>
[% IF Param("usebugaliases") AND bug.alias AND NOT bug.error %]
[% IF Param("usebugaliases") AND bug.alias %]
(<a href="show_bug.cgi?id=[% bug.alias | url_quote %]">
[% bug.alias | html %]</a>)
[% END %]
</h1>
<table class="bugfields">
[% IF bug.error %]
[% IF error %]
<tr>
<td class="error">
[% IF bug.error == "InvalidBugId" %]
@ -112,10 +116,10 @@
<tr>
<th>[% field_descs.product | html %]:</th>
<td>
[% IF Param("useclassification") && bug.classification_id != 1 %]
[[% bug.classification_obj.name | html %]]&nbsp;
[% END %]
[% bug.product_obj.name | html %]
[% IF Param("useclassification") %]
[% bug.classification_obj.name | html %]/
[%- END -%]
[%- bug.product_obj.name | html %]
</td>
[% PROCESS rightcell %]