summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Bugzilla/Attachment.pm7
-rw-r--r--template/en/default/attachment/list.html.tmpl6
2 files changed, 11 insertions, 2 deletions
diff --git a/Bugzilla/Attachment.pm b/Bugzilla/Attachment.pm
index 4d223d633..10fa6ddfc 100644
--- a/Bugzilla/Attachment.pm
+++ b/Bugzilla/Attachment.pm
@@ -75,7 +75,8 @@ sub query
my $list = $dbh->selectall_arrayref("SELECT attach_id, " .
$dbh->sql_date_format('creation_ts', '%Y.%m.%d %H:%i') .
", mimetype, description, ispatch,
- isobsolete, isprivate, LENGTH(thedata)
+ isobsolete, isprivate, LENGTH(thedata),
+ submitter_id
FROM attachments
WHERE bug_id = ? ORDER BY attach_id",
undef, $bugid);
@@ -85,7 +86,9 @@ sub query
my %a;
($a{'attachid'}, $a{'date'}, $a{'contenttype'},
$a{'description'}, $a{'ispatch'}, $a{'isobsolete'},
- $a{'isprivate'}, $a{'datasize'}) = @$row;
+ $a{'isprivate'}, $a{'datasize'}, $a{'submitter_id'}) = @$row;
+
+ $a{'submitter'} = new Bugzilla::User($a{'submitter_id'});
# Retrieve a list of flags for this attachment.
$a{'flags'} = Bugzilla::Flag::match({ 'attach_id' => $a{'attachid'},
diff --git a/template/en/default/attachment/list.html.tmpl b/template/en/default/attachment/list.html.tmpl
index 8f6bbadb1..b632d4211 100644
--- a/template/en/default/attachment/list.html.tmpl
+++ b/template/en/default/attachment/list.html.tmpl
@@ -24,6 +24,7 @@
<tr>
<th bgcolor="#cccccc" align="left">Attachment</th>
<th bgcolor="#cccccc" align="left">Type</th>
+ <th bgcolor="#cccccc" align="left">Creator</th>
<th bgcolor="#cccccc" align="left">Created</th>
<th bgcolor="#cccccc" align="left">Size</th>
[% IF show_attachment_flags %]
@@ -47,6 +48,11 @@
[% END %]
</td>
+ <td valign="top">
+ <a href="mailto:[% attachment.submitter.email FILTER html %]">
+ [% attachment.submitter.name || attachment.submitter.login FILTER html %]
+ </a>
+ </td>
<td valign="top">[% attachment.date FILTER time %]</td>
<td valign="top">[% attachment.datasize FILTER unitconvert %]</td>