diff options
| -rwxr-xr-x | attachment.cgi | 1 | ||||
| -rw-r--r-- | template/en/default/attachment/show-multiple.html.tmpl | 15 | ||||
| -rw-r--r-- | template/en/default/filterexceptions.pl | 1 |
3 files changed, 13 insertions, 4 deletions
diff --git a/attachment.cgi b/attachment.cgi index 83a910ee0..c1e8f9dd0 100755 --- a/attachment.cgi +++ b/attachment.cgi @@ -768,6 +768,7 @@ sub viewall $a{'description'}, $a{'ispatch'}, $a{'isobsolete'}, $a{'isprivate'}, $a{'datasize'}) = FetchSQLData(); $a{'isviewable'} = isViewable($a{'contenttype'}); + $a{'flags'} = Bugzilla::Flag::match({ 'attach_id' => $a{'attachid'} }); # Add the hash representing the attachment to the array of attachments. push @attachments, \%a; diff --git a/template/en/default/attachment/show-multiple.html.tmpl b/template/en/default/attachment/show-multiple.html.tmpl index bcfae488d..e7043a142 100644 --- a/template/en/default/attachment/show-multiple.html.tmpl +++ b/template/en/default/attachment/show-multiple.html.tmpl @@ -61,11 +61,18 @@ <td valign="top">[% a.datasize FILTER unitconvert %]</td> <td valign="top"> - [% IF a.statuses.size == 0 %] - <i>none</i> + [% IF a.flags.size == 0 %] + <i>no flags</i> [% ELSE %] - [% FOREACH s = a.statuses %] - [% s FILTER html FILTER replace('\s', ' ') %]<br> + [% FOREACH flag = a.flags %] + [% IF flag.setter %] + [% flag.setter.nick FILTER html %]: + [% END %] + [%+ flag.type.name FILTER html %][% flag.status %] + [% IF flag.status == "?" && flag.requestee %] + ([% flag.requestee.nick FILTER html %]) + [% END %] + [% ", " IF !loop.last %] [% END %] [% END %] </td> diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl index 1c74c3b89..c030fa04f 100644 --- a/template/en/default/filterexceptions.pl +++ b/template/en/default/filterexceptions.pl @@ -450,6 +450,7 @@ 'attachment/show-multiple.html.tmpl' => [ 'a.attachid', + 'flag.status' ], 'attachment/updated.html.tmpl' => [ |