aboutsummaryrefslogtreecommitdiffstats
path: root/template
diff options
context:
space:
mode:
authorMatt Selsky <selsky@columbia.edu>2011-12-26 13:48:18 +0100
committerFrédéric Buclin <LpSolit@gmail.com>2011-12-26 13:48:18 +0100
commit6d02055deb5a8bbeff15459f150e129bbf725eab (patch)
treefe97cc1af3bbc938fc7a5e050ae9cebdb9fa3015 /template
parent429534ee24bfbfce0c330b92e0167b4c8cff6b5f (diff)
downloadbugs-6d02055deb5a8bbeff15459f150e129bbf725eab.tar
bugs-6d02055deb5a8bbeff15459f150e129bbf725eab.tar.gz
bugs-6d02055deb5a8bbeff15459f150e129bbf725eab.tar.bz2
bugs-6d02055deb5a8bbeff15459f150e129bbf725eab.tar.xz
bugs-6d02055deb5a8bbeff15459f150e129bbf725eab.zip
Bug 399080: Remove the 'usebugaliases' parameter (turned on permanently)
r/a=LpSolit
Diffstat (limited to 'template')
-rw-r--r--template/en/default/admin/params/bugfields.html.tmpl3
-rw-r--r--template/en/default/bug/create/create.html.tmpl7
-rw-r--r--template/en/default/bug/edit.html.tmpl10
-rw-r--r--template/en/default/bug/show-multiple.html.tmpl4
-rw-r--r--template/en/default/global/user-error.html.tmpl4
-rw-r--r--template/en/default/pages/fields.html.tmpl1
-rw-r--r--template/en/default/pages/quicksearch.html.tmpl9
7 files changed, 11 insertions, 27 deletions
diff --git a/template/en/default/admin/params/bugfields.html.tmpl b/template/en/default/admin/params/bugfields.html.tmpl
index 58b08f615..a58fe5a95 100644
--- a/template/en/default/admin/params/bugfields.html.tmpl
+++ b/template/en/default/admin/params/bugfields.html.tmpl
@@ -34,9 +34,6 @@
usestatuswhiteboard => "Do you wish to use the Status Whiteboard field?",
- usebugaliases => "Do you wish to use $terms.bug aliases, which allow you to assign " _
- "$terms.bugs an easy-to-remember name by which you can refer to them?",
-
use_see_also =>
"Do you wish to use the See Also field? It allows you refer to"
_ " $terms.bugs in other installations. Even if you disable this field,"
diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index ee19ab5d6..616fab888 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -352,9 +352,8 @@ TUI_hide_default('attachment_text_field');
<td>&nbsp;</td>
[%# Calculate the number of rows we can use for flags %]
- [% num_rows = 6 + (Param("useqacontact") ? 1 : 0) +
- (user.is_timetracker ? 3 : 0) +
- (Param("usebugaliases") ? 1 : 0)
+ [% num_rows = 7 + (Param("useqacontact") ? 1 : 0) +
+ (user.is_timetracker ? 3 : 0)
%]
<td rowspan="[% num_rows FILTER html %]">
@@ -464,7 +463,6 @@ TUI_hide_default('attachment_text_field');
</tr>
[% END %]
-[% IF Param("usebugaliases") %]
<tr>
[% INCLUDE "bug/field-label.html.tmpl"
field = bug_fields.alias editable = 1
@@ -473,7 +471,6 @@ 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/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 03b713913..7dd1baaff 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -186,10 +186,8 @@
<a href="show_bug.cgi?id=[% bug.bug_id %]">
[%-# %]<b>[% terms.Bug %]&nbsp;[% bug.bug_id FILTER html %]</b>
[%-# %]</a> -<span id="summary_alias_container" class="bz_default_hidden">
- [% IF Param("usebugaliases") %]
- [% IF bug.alias != "" %]
- (<span id="alias_nonedit_display">[% bug.alias FILTER html %]</span>)
- [% END %]
+ [% IF bug.alias != "" %]
+ (<span id="alias_nonedit_display">[% bug.alias FILTER html %]</span>)
[% END %]
<span id="short_desc_nonedit_display">[% bug.short_desc FILTER quoteUrls(bug) %]</span>
[% IF bug.check_can_change_field('short_desc', 0, 1) ||
@@ -201,8 +199,7 @@
<div id="summary_alias_input">
<table id="summary">
- [% IF Param("usebugaliases") %]
- <tr>
+ <tr>
[% IF bug.check_can_change_field('alias', 0, 1) %]
<td>
<label
@@ -224,7 +221,6 @@
&& bug.alias %]
</td>
</tr>
- [% END %]
[%# *** Summary *** %]
<tr>
<td>
diff --git a/template/en/default/bug/show-multiple.html.tmpl b/template/en/default/bug/show-multiple.html.tmpl
index 33dde14a3..854ad5ae7 100644
--- a/template/en/default/bug/show-multiple.html.tmpl
+++ b/template/en/default/bug/show-multiple.html.tmpl
@@ -65,7 +65,7 @@
<h1>
[% terms.Bug %]
<a href="show_bug.cgi?id=[% bug.bug_id FILTER html %]">[% bug.bug_id FILTER html %]</a>
- [% IF Param("usebugaliases") AND bug.alias AND NOT bug.error %]
+ [% IF bug.alias AND NOT bug.error %]
(<a href="show_bug.cgi?id=[% bug.alias FILTER uri %]">
[% bug.alias FILTER html %]</a>)
[% END %]
@@ -77,7 +77,7 @@
<td class="error">
[% IF bug.error == "InvalidBugId" %]
'[%+ bug.bug_id FILTER html %]' is not a valid [% terms.bug %] number
- [%- IF Param("usebugaliases") %] nor a known [% terms.bug %] alias[% END %].
+ nor a known [% terms.bug %] alias.
[% ELSIF bug.error == "NotPermitted" %]
You are not allowed to view this [% terms.bug %].
[% ELSIF bug.error == "NotFound" %]
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index fc290eb53..89926bfd5 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -914,9 +914,7 @@
[% END %]
[% IF bug_id %]
'[% bug_id FILTER html %]' is not a valid [% terms.bug %] number
- [% IF Param("usebugaliases") %]
- nor an alias to [% terms.abug %]
- [% END %].
+ nor an alias to [% terms.abug %].
[% ELSE %]
[% IF field %]
The '[% field_descs.$field FILTER html %]' field
diff --git a/template/en/default/pages/fields.html.tmpl b/template/en/default/pages/fields.html.tmpl
index 2794e1cc4..c0bf3811d 100644
--- a/template/en/default/pages/fields.html.tmpl
+++ b/template/en/default/pages/fields.html.tmpl
@@ -220,7 +220,6 @@
[% NEXT IF field == 'status_whiteboard' AND !Param('usestatuswhiteboard') %]
[% NEXT IF field == 'target_milestone' AND !Param('usetargetmilestone') %]
- [% NEXT IF field == 'alias' AND !Param('usebugaliases') %]
[%# For now we don't have help for attachment fields and so on. %]
[% NEXT IF field.match('\.') %]
diff --git a/template/en/default/pages/quicksearch.html.tmpl b/template/en/default/pages/quicksearch.html.tmpl
index e6398eade..0e6a9e511 100644
--- a/template/en/default/pages/quicksearch.html.tmpl
+++ b/template/en/default/pages/quicksearch.html.tmpl
@@ -46,17 +46,14 @@
[%+ field_descs.product FILTER html %],
[%+ field_descs.component FILTER html %],
[%+ IF use_keywords %][%+ field_descs.keywords FILTER html %],[% END %]
- [%+ IF Param('usebugaliases') %][% field_descs.alias FILTER html %],[% END %]
+ [%+ field_descs.alias FILTER html %],
[%+ field_descs.short_desc FILTER html %],
[%+ IF Param('usestatuswhiteboard') %][% field_descs.status_whiteboard FILTER html %],[% END %]
and [% field_descs.longdesc FILTER html %] fields for your word or words.</li>
<li>Typing just a <strong>number</strong> in the search box will take
- you directly to the [% terms.bug %] with that ID.
- [% IF Param('usebugaliases') %]
- Also, just typing the <strong>alias</strong> of [% terms.abug %]
- will take you to that [% terms.bug %].
- [% END %]
+ you directly to the [% terms.bug %] with that ID. Also, just typing the
+ <strong>alias</strong> of [% terms.abug %] will take you to that [% terms.bug %].
</li>
<li>Adding more terms <strong>narrows down</strong> the search, it does not