From 6d02055deb5a8bbeff15459f150e129bbf725eab Mon Sep 17 00:00:00 2001 From: Matt Selsky Date: Mon, 26 Dec 2011 13:48:18 +0100 Subject: Bug 399080: Remove the 'usebugaliases' parameter (turned on permanently) r/a=LpSolit --- template/en/default/admin/params/bugfields.html.tmpl | 3 --- template/en/default/bug/create/create.html.tmpl | 7 ++----- template/en/default/bug/edit.html.tmpl | 10 +++------- template/en/default/bug/show-multiple.html.tmpl | 4 ++-- template/en/default/global/user-error.html.tmpl | 4 +--- template/en/default/pages/fields.html.tmpl | 1 - template/en/default/pages/quicksearch.html.tmpl | 9 +++------ 7 files changed, 11 insertions(+), 27 deletions(-) (limited to 'template/en/default') 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');   [%# 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) %] @@ -464,7 +463,6 @@ TUI_hide_default('attachment_text_field'); [% END %] -[% IF Param("usebugaliases") %] [% INCLUDE "bug/field-label.html.tmpl" field = bug_fields.alias editable = 1 @@ -473,7 +471,6 @@ TUI_hide_default('attachment_text_field'); -[% END %] [% 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 @@ [%-# %][% terms.Bug %] [% bug.bug_id FILTER html %] [%-# %] - - [% IF Param("usebugaliases") %] - [% IF bug.alias != "" %] - ([% bug.alias FILTER html %]) - [% END %] + [% IF bug.alias != "" %] + ([% bug.alias FILTER html %]) [% END %] [% bug.short_desc FILTER quoteUrls(bug) %] [% IF bug.check_can_change_field('short_desc', 0, 1) || @@ -201,8 +199,7 @@
- [% IF Param("usebugaliases") %] - + [% IF bug.check_can_change_field('alias', 0, 1) %] - [% END %] [%# *** Summary *** %]
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 @@

[% terms.Bug %] [% bug.bug_id FILTER html %] - [% IF Param("usebugaliases") AND bug.alias AND NOT bug.error %] + [% IF bug.alias AND NOT bug.error %] ( [% bug.alias FILTER html %]) [% END %] @@ -77,7 +77,7 @@

[% 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.
  • Typing just a number in the search box will take - you directly to the [% terms.bug %] with that ID. - [% IF Param('usebugaliases') %] - Also, just typing the alias of [% terms.abug %] - will take you to that [% terms.bug %]. - [% END %] + you directly to the [% terms.bug %] with that ID. Also, just typing the + alias of [% terms.abug %] will take you to that [% terms.bug %].
  • Adding more terms narrows down the search, it does not -- cgit v1.2.3-24-g4f1b