summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjouni%heikniemi.net <>2004-05-31 00:52:12 +0200
committerjouni%heikniemi.net <>2004-05-31 00:52:12 +0200
commit90f6e932e23ec82dd31149a118661a91f51a5e90 (patch)
treef8a0bd844a535c4d6e1e60ef145f6dc2b3c3209c
parent15ca6f2c2edc03a15adf06374015edbfb0a58ecb (diff)
downloadbugzilla-90f6e932e23ec82dd31149a118661a91f51a5e90.tar.gz
bugzilla-90f6e932e23ec82dd31149a118661a91f51a5e90.tar.xz
Bug 223541: Make flags show up correctly in "View all attachments" mode.
r=joel a=justdave
-rwxr-xr-xattachment.cgi1
-rw-r--r--template/en/default/attachment/show-multiple.html.tmpl15
-rw-r--r--template/en/default/filterexceptions.pl1
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', '&nbsp;') %]<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' => [