diff options
Diffstat (limited to 'template/en/default')
| -rw-r--r-- | template/en/default/global/user-error.html.tmpl | 4 | ||||
| -rw-r--r-- | template/en/default/request/email.txt.tmpl | 17 |
2 files changed, 10 insertions, 11 deletions
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index dd2e529c2..3b901929f 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -446,7 +446,7 @@ You asked [% requestee.identity FILTER html %] for <code>[% flag_type.name FILTER html %]</code> on [% terms.bug %] [%+ bug_id FILTER html -%] - [% IF attachment %], attachment [% attachment.id FILTER html %][% END %], + [% IF attach_id > 0 %], attachment [% attach_id FILTER html %][% END %], but that [% terms.bug %] has been restricted to users in certain groups, and the user you asked isn't in all the groups to which the [% terms.bug %] has been restricted. @@ -463,7 +463,7 @@ You asked [% requestee.identity FILTER html %] for <code>[% flag_type.name FILTER html %]</code> on [%+ terms.bug %] [%+ bug_id FILTER html %], - attachment [% attachment.id FILTER html %], but that attachment + attachment [% attach_id FILTER html %], but that attachment is restricted to users in the [% Param("insidergroup") FILTER html %] group, and the user you asked isn't in that group. Please choose someone else to ask, or ask an administrator to add the user to the group. diff --git a/template/en/default/request/email.txt.tmpl b/template/en/default/request/email.txt.tmpl index 6e92c72ca..3fb08c447 100644 --- a/template/en/default/request/email.txt.tmpl +++ b/template/en/default/request/email.txt.tmpl @@ -23,9 +23,8 @@ [% PROCESS global/variables.none.tmpl %] -[% bugidsummary = flag.target.bug.id _ ': ' _ flag.target.bug.summary %] -[% attidsummary = flag.target.attachment.id _ ': ' _ - flag.target.attachment.summary %] +[% bugidsummary = bug.bug_id _ ': ' _ bug.short_desc %] +[% attidsummary = attachment.id _ ': ' _ attachment.description %] [% statuses = { '+' => "granted" , '-' => 'denied' , 'X' => "cancelled" , '?' => "asked" } %] [% IF flag.status == '?' %] @@ -39,9 +38,9 @@ [% END %] From: bugzilla-request-daemon To: [% to %] -Subject: [% flag.type.name %] [%+ subject_status %]: [[% terms.Bug %] [%+ flag.target.bug.id %]] [% flag.target.bug.summary %] -[%- IF flag.target.attachment.exists %] : - [Attachment [% flag.target.attachment.id %]] [% flag.target.attachment.summary %][% END %] +Subject: [% flag.type.name %] [%+ subject_status %]: [[% terms.Bug %] [%+ bug.bug_id %]] [% bug.short_desc %] +[%- IF attachment %] : + [Attachment [% attachment.id %]] [% attachment.description %][% END %] [%+ USE wrap -%] [%- FILTER bullet = wrap(80) -%] @@ -50,13 +49,13 @@ Subject: [% flag.type.name %] [%+ subject_status %]: [[% terms.Bug %] [%+ flag.t [% terms.Bug %] [%+ bugidsummary %] [% END %] -[%+ Param('urlbase') %]show_bug.cgi?id=[% flag.target.bug.id %] -[% IF flag.target.attachment.exists %] +[%+ Param('urlbase') %]show_bug.cgi?id=[% bug.bug_id %] +[% IF attachment %] [% FILTER bullet = wrap(80) %] Attachment [% attidsummary %] [%- END %] -[%+ Param('urlbase') %]attachment.cgi?id=[% flag.target.attachment.id %]&action=edit +[%+ Param('urlbase') %]attachment.cgi?id=[% attachment.id %]&action=edit [%- END %] [%- FILTER bullet = wrap(80) %] |