diff options
| author | Simon Green <mail@simon.green> | 2015-08-19 08:17:13 +0200 |
|---|---|---|
| committer | Simon Green <mail@simon.green> | 2015-08-19 08:17:13 +0200 |
| commit | 727ba2a265bf860c6463eb70fb0c5c256fddd434 (patch) | |
| tree | 63bb37f8054dac72b62beeed612f9c0d074f98ee /template | |
| parent | fe168e2dc6771d97e9c672f207e49e354a0ec892 (diff) | |
| download | bugzilla-727ba2a265bf860c6463eb70fb0c5c256fddd434.tar.gz bugzilla-727ba2a265bf860c6463eb70fb0c5c256fddd434.tar.xz | |
Bug 404663 - aliases should be reserved for people w/ editbugs
r=dkl, a=simon
Diffstat (limited to 'template')
| -rw-r--r-- | template/en/default/bug/create/create.html.tmpl | 7 | ||||
| -rw-r--r-- | template/en/default/global/user-error.html.tmpl | 11 |
2 files changed, 14 insertions, 4 deletions
diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl index 23fb276c9..367292756 100644 --- a/template/en/default/bug/create/create.html.tmpl +++ b/template/en/default/bug/create/create.html.tmpl @@ -269,8 +269,9 @@ TUI_hide_default('attachment_text_field'); <td> </td> [%# Calculate the number of rows we can use for flags %] - [% num_rows = 6 + (Param("useqacontact") ? 1 : 0) + - (user.is_timetracker ? 3 : 0) + [% num_rows = 5 + (Param("useqacontact") ? 1 : 0) + + (user.is_timetracker ? 3 : 0) + + (user.in_group('editbugs', product.id) ? 1 : 0) %] <td rowspan="[% num_rows FILTER html %]"> @@ -380,6 +381,7 @@ TUI_hide_default('attachment_text_field'); </tr> [% END %] +[% IF user.in_group('editbugs', product.id) %] <tr> [% INCLUDE "bug/field-label.html.tmpl" field = bug_fields.alias editable = 1 @@ -388,6 +390,7 @@ TUI_hide_default('attachment_text_field'); <input name="alias" size="20" value="[% alias FILTER html %]"> </td> </tr> +[% END %] <tr> [% INCLUDE "bug/field-label.html.tmpl" diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index fe548f927..57c06c204 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -923,8 +923,15 @@ [% ELSIF error == "illegal_change" %] [% title = "Not allowed" %] - You tried to change the - <strong>[% field_descs.$field FILTER html %]</strong> field + You tried to + [% IF action == "set" %] + set + [% ELSIF action == "unset" %] + unset + [% ELSE %] + change + [% END %] + the <strong>[% field_descs.$field FILTER html %]</strong> field [% IF oldvalue.defined AND oldvalue != "" %] from <em>[% oldvalue.join(', ') FILTER html %]</em> [% END %] |