diff options
Diffstat (limited to 'template/en/default/bug')
| -rw-r--r-- | template/en/default/bug/format_comment.txt.tmpl | 13 | ||||
| -rw-r--r-- | template/en/default/bug/show.xml.tmpl | 3 |
2 files changed, 11 insertions, 5 deletions
diff --git a/template/en/default/bug/format_comment.txt.tmpl b/template/en/default/bug/format_comment.txt.tmpl index 8e97d4d08..49ab95ad1 100644 --- a/template/en/default/bug/format_comment.txt.tmpl +++ b/template/en/default/bug/format_comment.txt.tmpl @@ -32,11 +32,6 @@ [% PROCESS 'global/variables.none.tmpl' %] [% SET comment_body = comment.body %] -[% IF is_bugmail %] - [% comment_body = comment_body.replace( '(Created an attachment \(id=([0-9]+)\))', - '$1' _ "\n" _ ' --> (' _ urlbase - _ 'attachment.cgi?id=$2)' ) %] -[% END %] [% IF comment.type == constants.CMT_DUPE_OF %] X[% comment_body %] @@ -54,6 +49,14 @@ If the move succeeded, [% comment.extra_data %] will receive a mail containing the number of the new [% terms.bug %] in the other database. If all went well, please paste in a link to the new [% terms.bug %]. Otherwise, reopen this [% terms.bug %]. +[% ELSIF comment.type == constants.CMT_ATTACHMENT_CREATED %] +Created attachment [% comment.extra_data %] +[% IF is_bugmail %] + --> [% urlbase _ "attachment.cgi?id=" _ comment.extra_data %] +[% END %] +[%+ comment.attachment.description %] + +[%+ comment.body %] [% ELSE %] X[% comment_body %] [% END %] diff --git a/template/en/default/bug/show.xml.tmpl b/template/en/default/bug/show.xml.tmpl index 31e56d299..2349602dc 100644 --- a/template/en/default/bug/show.xml.tmpl +++ b/template/en/default/bug/show.xml.tmpl @@ -69,6 +69,9 @@ [% NEXT IF c.is_private && !user.is_insider %] <long_desc isprivate="[% c.is_private FILTER xml %]"> <commentid>[% c.id FILTER xml %]</commentid> + [% IF c.is_about_attachment %] + <attachid>[% c.extra_data FILTER xml %]</attachid> + [% END %] <who name="[% c.author.name FILTER xml %]">[% c.author.email FILTER email FILTER xml %]</who> <bug_when>[% c.creation_ts FILTER time("%Y-%m-%d %T %z") FILTER xml %]</bug_when> [% IF user.is_timetracker && (c.work_time - 0 != 0) %] |