diff options
Diffstat (limited to 'template/en/default')
| -rw-r--r-- | template/en/default/attachment/list.html.tmpl | 12 | ||||
| -rw-r--r-- | template/en/default/bug/show.xml.tmpl | 4 | ||||
| -rw-r--r-- | template/en/default/filterexceptions.pl | 4 | ||||
| -rw-r--r-- | template/en/default/global/user-error.html.tmpl | 11 |
4 files changed, 15 insertions, 16 deletions
diff --git a/template/en/default/attachment/list.html.tmpl b/template/en/default/attachment/list.html.tmpl index 4f66a5eb8..61b68ee53 100644 --- a/template/en/default/attachment/list.html.tmpl +++ b/template/en/default/attachment/list.html.tmpl @@ -37,7 +37,7 @@ [% IF !attachment.isprivate || canseeprivate %] <tr [% "class=\"bz_private\"" IF attachment.isprivate %]> <td valign="top"> - <a href="attachment.cgi?id=[% attachment.attachid %]">[% attachment.description FILTER html FILTER obsolete(attachment.isobsolete) %]</a> + <a href="attachment.cgi?id=[% attachment.id %]">[% attachment.description FILTER html FILTER obsolete(attachment.isobsolete) %]</a> </td> <td valign="top"> @@ -49,11 +49,11 @@ </td> <td valign="top"> - <a href="mailto:[% attachment.submitter.email FILTER html %]"> - [% attachment.submitter.name || attachment.submitter.login FILTER html %] + <a href="mailto:[% attachment.attacher.email FILTER html %]"> + [% attachment.attacher.name || attachment.attacher.login FILTER html %] </a> </td> - <td valign="top">[% attachment.date FILTER time %]</td> + <td valign="top">[% attachment.attached FILTER time %]</td> <td valign="top">[% attachment.datasize FILTER unitconvert %]</td> [% IF show_attachment_flags %] @@ -75,9 +75,9 @@ [% END %] <td valign="top"> - <a href="attachment.cgi?id=[% attachment.attachid %]&action=edit">Edit</a> + <a href="attachment.cgi?id=[% attachment.id %]&action=edit">Edit</a> [% IF attachment.ispatch && patchviewerinstalled %] - | <a href="attachment.cgi?id=[% attachment.attachid %]&action=diff">Diff</a> + | <a href="attachment.cgi?id=[% attachment.id %]&action=diff">Diff</a> [% END %] [% Hook.process("action") %] </td> diff --git a/template/en/default/bug/show.xml.tmpl b/template/en/default/bug/show.xml.tmpl index 222204936..2555600ed 100644 --- a/template/en/default/bug/show.xml.tmpl +++ b/template/en/default/bug/show.xml.tmpl @@ -73,8 +73,8 @@ ispatch="1" [% END %] > - <attachid>[% a.attachid %]</attachid> - <date>[% a.date FILTER time FILTER xml %]</date> + <attachid>[% a.id %]</attachid> + <date>[% a.attached FILTER time FILTER xml %]</date> <desc>[% a.description FILTER xml %]</desc> <ctype>[% a.contenttype FILTER xml %]</ctype> [% FOREACH flag = a.flags %] diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl index cc5a19d09..8ed71f008 100644 --- a/template/en/default/filterexceptions.pl +++ b/template/en/default/filterexceptions.pl @@ -368,7 +368,7 @@ 'bug/show.xml.tmpl' => [ 'VERSION', - 'a.attachid', + 'a.id', 'field', ], @@ -458,7 +458,7 @@ ], 'attachment/list.html.tmpl' => [ - 'attachment.attachid', + 'attachment.id', 'flag.status', 'bugid', ], diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index 3e1a2a3ef..53fdcc59f 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -442,7 +442,7 @@ You asked [% requestee.identity FILTER html %] for <code>[% flag_type.name FILTER html %]</code> on [% terms.bug %] [% bug_id FILTER html -%] - [% IF attach_id %], attachment [% attach_id FILTER html %][% END %], + [% IF attachment %], attachment [% attachment.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. @@ -455,11 +455,10 @@ You asked [% requestee.identity FILTER html %] for <code>[% flag_type.name FILTER html %]</code> on [%+ terms.bug %] [%+ bug_id FILTER html %], - 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. + attachment [% attachment.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. [% ELSIF error == "flag_type_cc_list_invalid" %] [% title = "Flag Type CC List Invalid" %] |