diff options
| author | Dave Lawrence <dlawrence@mozilla.com> | 2012-07-24 00:14:02 +0200 |
|---|---|---|
| committer | Dave Lawrence <dlawrence@mozilla.com> | 2012-07-24 00:14:02 +0200 |
| commit | 8c5d6e253a72c941574165d2a9e147099ec7fb46 (patch) | |
| tree | 90e1f286c7ad677e24ae757c3565eac5171db77c | |
| parent | 9a63ac0764abca55f1b61a4c0719315002c02ac0 (diff) | |
| download | bugzilla-8c5d6e253a72c941574165d2a9e147099ec7fb46.tar.gz bugzilla-8c5d6e253a72c941574165d2a9e147099ec7fb46.tar.xz | |
Bug 771107 - List of attachments in attachment details screen does not distinguish obsolete attachments
r=glob, a=LpSolit
| -rwxr-xr-x | attachment.cgi | 2 | ||||
| -rw-r--r-- | template/en/default/attachment/edit.html.tmpl | 13 | ||||
| -rw-r--r-- | template/en/default/filterexceptions.pl | 1 |
3 files changed, 10 insertions, 6 deletions
diff --git a/attachment.cgi b/attachment.cgi index 16c964e47..e696c95a7 100755 --- a/attachment.cgi +++ b/attachment.cgi @@ -606,8 +606,6 @@ sub edit { my $bugattachments = Bugzilla::Attachment->get_attachments_by_bug($attachment->bug); - # We only want attachment IDs. - @$bugattachments = map { $_->id } @$bugattachments; my $any_flags_requesteeble = grep { $_->is_requestable && $_->is_requesteeble } @{$attachment->flag_types}; diff --git a/template/en/default/attachment/edit.html.tmpl b/template/en/default/attachment/edit.html.tmpl index 2062e6d6c..67dcabd75 100644 --- a/template/en/default/attachment/edit.html.tmpl +++ b/template/en/default/attachment/edit.html.tmpl @@ -303,10 +303,17 @@ <div id="attachment_list"> Attachments on [% "$terms.bug ${attachment.bug_id}" FILTER bug_link(attachment.bug_id) FILTER none %]: [% FOREACH a = attachments %] - [% IF a == attachment.id %] - [%+ a %] + [% IF a.isobsolete %] + <span class="bz_obsolete"> + [% END %] + [% IF a.id == attachment.id %] + [%+ a.id FILTER html %] [% ELSE %] - <a href="attachment.cgi?id=[% a %]&action=edit">[% a %]</a> + <a href="attachment.cgi?id=[% a.id FILTER uri %]&action=edit" + title="[% a.description FILTER html %]">[% a.id FILTER html %]</a> + [% END %] + [% IF a.isobsolete %] + </span> [% END %] [% " |" UNLESS loop.last() %] [% END %] diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl index e3cfec8a2..5401772ea 100644 --- a/template/en/default/filterexceptions.pl +++ b/template/en/default/filterexceptions.pl @@ -304,7 +304,6 @@ 'attachment/edit.html.tmpl' => [ 'attachment.id', 'attachment.bug_id', - 'a', 'editable_or_hide', ], |