Bug 399080: Remove the 'usebugaliases' parameter (turned on permanently)

r/a=LpSolit

diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index 5e54318fb8b9bb4462f854b4dc29436784aefdf2..362fa90d71763f960cd7a3781dd02e7db9b72be8 100644 (file)
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -337,12 +337,11 @@ sub new {
     # If we get something that looks like a word (not a number),
     # make it the "name" param.
     if (!defined $param || (!ref($param) && $param !~ /^\d+$/)) {
-        # But only if aliases are enabled.
-        if (Bugzilla->params->{'usebugaliases'} && $param) {
+        if ($param) {
             $param = { name => $param };
         }
         else {
-            # Aliases are off, and we got something that's not a number.
+            # We got something that's not a number.
             my $error_self = {};
             bless $error_self, $class;
             $error_self->{'bug_id'} = $param;
@@ -611,8 +610,7 @@ sub possible_duplicates {
 # C<rep_platform> - B<Required> The platform the bug was found against.
 # C<version>      - B<Required> The version of the product the bug was found in.
 #
-# C<alias>        - An alias for this bug. Will be ignored if C<usebugaliases>
-#                   is off.
+# C<alias>        - An alias for this bug.
 # C<target_milestone> - When this bug is expected to be fixed.
 # C<status_whiteboard> - A string.
 # C<bug_status>   - The initial status of the bug, a string.
@@ -1202,7 +1200,7 @@ sub _send_bugmail {
 sub _check_alias {
    my ($invocant, $alias) = @_;
    $alias = trim($alias);
-   return undef if (!Bugzilla->params->{'usebugaliases'} || !$alias);
+   return undef if (!$alias);
 
     # Make sure the alias isn't too long.
     if (length($alias) > 20) {
@@ -3696,7 +3694,6 @@ sub choices {
 # the ID of the bug if it exists or the undefined value if it doesn't.
 sub bug_alias_to_id {
     my ($alias) = @_;
-    return undef unless Bugzilla->params->{"usebugaliases"};
     my $dbh = Bugzilla->dbh;
     trick_taint($alias);
     return $dbh->selectrow_array(

diff --git a/Bugzilla/Config/BugFields.pm b/Bugzilla/Config/BugFields.pm
index d0de9dac601cc795b04a25c788f8d8c10e3386b9..651bc9e6508927ff9393d6bdd5ceaa20532a637c 100644 (file)
--- a/Bugzilla/Config/BugFields.pm
+++ b/Bugzilla/Config/BugFields.pm
@@ -71,12 +71,6 @@ sub get_param_list {
    default => 0
   },
 
-  {
-   name => 'usebugaliases',
-   type => 'b',
-   default => 0
-  },
-
   {
    name => 'use_see_also',
    type => 'b',

diff --git a/Bugzilla/WebService/Bug.pm b/Bugzilla/WebService/Bug.pm
index b0f8c0a0cd147bd44e99d12adf1f90dd033aa761..9a67f230483db6f1a74d47fb252f683be9da0595 100644 (file)
--- a/Bugzilla/WebService/Bug.pm
+++ b/Bugzilla/WebService/Bug.pm
@@ -383,14 +383,7 @@ sub history {
         # alias is returned in case users passes a mixture of ids and aliases
         # then they get to know which bug activity relates to which value  
         # they passed
-        if (Bugzilla->params->{'usebugaliases'}) {
-            $item{alias} = $self->type('string', $bug->alias);
-        }
-        else {
-            # For API reasons, we always want the value to appear, we just
-            # don't want it to have a value if aliases are turned off.
-            $item{alias} = undef;
-        }
+        $item{alias} = $self->type('string', $bug->alias);
 
         push(@return, \%item);
     }
@@ -527,14 +520,7 @@ sub update {
         # alias is returned in case users pass a mixture of ids and aliases,
         # so that they can know which set of changes relates to which value
         # they passed.
-        if (Bugzilla->params->{'usebugaliases'}) {
-            $hash{alias} = $self->type('string', $bug->alias);
-        }
-        else {
-            # For API reasons, we always want the alias field to appear, we
-            # just don't want it to have a value if aliases are turned off.
-            $hash{alias} = $self->type('string', '');
-        }
+        $hash{alias} = $self->type('string', $bug->alias);
 
         my %changes = %{ $all_changes{$bug->id} };
         foreach my $field (keys %changes) {
@@ -1573,10 +1559,6 @@ from the Bugzilla database to fetch. If it contains any non-numeric
 characters, it is considered to be a bug alias instead, and the bug with 
 that alias will be loaded. 
 
-Note that it's possible for aliases to be disabled in Bugzilla, in which
-case you will be told that you have specified an invalid bug_id if you
-try to specify an alias. (It will be error 100.)
-
 =item C<permissive> B<EXPERIMENTAL>
 
 C<boolean> Normally, if you request any inaccessible or invalid bug ids,
@@ -1825,8 +1807,7 @@ invalid bug error.
 
 =item 100 (Invalid Bug Alias)
 
-If you specified an alias and either: (a) the Bugzilla you're querying
-doesn't support aliases or (b) there is no bug with that alias.
+If you specified an alias and there is no bug with that alias.
 
 =item 101 (Invalid Bug ID)
 
@@ -1913,10 +1894,6 @@ from the Bugzilla database to fetch. If it contains any non-numeric
 characters, it is considered to be a bug alias instead, and the data bug 
 with that alias will be loaded. 
 
-Note that it's possible for aliases to be disabled in Bugzilla, in which
-case you will be told that you have specified an invalid bug_id if you
-try to specify an alias. (It will be error 100.)
-
 =back
 
 =item B<Returns>
@@ -1932,8 +1909,7 @@ C<int> The numeric id of the bug.
 
 =item alias
 
-C<string> The alias of this bug. If there is no alias or aliases are 
-disabled in this Bugzilla, this will be undef.
+C<string> The alias of this bug. If there is no alias, this will be undef.
 
 =item history
 
@@ -2035,9 +2011,7 @@ most-common database to use with Bugzilla, and MySQL is not case sensitive).
 
 =item C<alias>
 
-C<string> The unique alias for this bug. Note that you can search
-by alias even if the alias field is disabled in this Bugzilla, but
-it's likely that there won't be any aliases set on bugs, in that case.
+C<string> The unique alias for this bug.
 
 =item C<assigned_to>
 
@@ -2534,8 +2508,7 @@ C<99999.99>.
 
 =item 100 (Invalid Bug Alias) 
 
-If you specified an alias and either: (a) the Bugzilla you're querying
-doesn't support aliases or (b) there is no bug with that alias.
+If you specified an alias and there is no bug with that alias.
 
 =item 101 (Invalid Bug ID)
 
@@ -2892,8 +2865,7 @@ C<int> The id of the bug that was updated.
 
 =item C<alias>
 
-C<string> The alias of the bug that was updated, if aliases are enabled and
-this bug has an alias.
+C<string> The alias of the bug that was updated, if this bug has an alias.
 
 =item C<last_change_time>
 

diff --git a/colchange.cgi b/colchange.cgi
index c3741f6238516376764d0944d74de801d7c51bcc..81b7d1e16b4403e5afb455781a497d1c58f33c7f 100755 (executable)
--- a/colchange.cgi
+++ b/colchange.cgi
@@ -40,7 +40,6 @@ use Storable qw(dclone);
 # Maps parameters that control columns to the names of columns.
 use constant COLUMN_PARAMS => {
     'useclassification'   => ['classification'],
-    'usebugaliases'       => ['alias'],
     'usetargetmilestone'  => ['target_milestone'],
     'useqacontact'        => ['qa_contact', 'qa_contact_realname'],
     'usestatuswhiteboard' => ['status_whiteboard'],

diff --git a/process_bug.cgi b/process_bug.cgi
index 2d04f73c17120f8f90ab94b3816b0e8ed83e2bca..2e054bc2960f9da9e97937bd143fcaa825a54afd 100755 (executable)
--- a/process_bug.cgi
+++ b/process_bug.cgi
@@ -306,7 +306,7 @@ if (defined $cgi->param('newcc')
 if (defined $cgi->param('id')) {
     # Since aliases are unique (like bug numbers), they can only be changed
     # for one bug at a time.
-    if (Bugzilla->params->{"usebugaliases"} && defined $cgi->param('alias')) {
+    if (defined $cgi->param('alias')) {
         $set_all_fields{alias} = $cgi->param('alias');
     }
 }

diff --git a/template/en/default/admin/params/bugfields.html.tmpl b/template/en/default/admin/params/bugfields.html.tmpl
index 58b08f6152f837aa5ff5a20c9dfc9c9a23889c6b..a58fe5a95d43555f842495ffd9d55add15af2a3c 100644 (file)
--- 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 ee19ab5d656c82a266031714b4702b7d86187f08..616fab8883010eb9de014585909d1f44f7dabe4c 100644 (file)
--- 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 03b7139132970cabaa0172b59c5ebb725e8e9786..7dd1baaff3448c5be87eb6ddf8aebfd9d9a45caf 100644 (file)
--- 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 33dde14a32fc58ea0232ccd1127adb02fc69ca3b..854ad5ae7556a64b20af1a28e189094a55896d37 100644 (file)
--- 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 fc290eb53786b23067729fb6ae9b4a48d0a20a44..89926bfd550b17b08e32ed4272e6814414338736 100644 (file)
--- 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 2794e1cc46370db725a5d9d882c521e3c91da8cb..c0bf3811da5c26463c9dd740d602cbecd3867499 100644 (file)
--- 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 e6398eade68c0e2a5a5c881274c1fe4bb686e415..0e6a9e511e6c51783f62896b3f22cae15c6836f0 100644 (file)
--- 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

diff --git a/xt/lib/Bugzilla/Test/Search.pm b/xt/lib/Bugzilla/Test/Search.pm
index f18d3e4cab0be16c0bcf09cc99f57871680b3a86..73b7c56fb6debf733d497b8e744852971c567ed5 100644 (file)
--- a/xt/lib/Bugzilla/Test/Search.pm
+++ b/xt/lib/Bugzilla/Test/Search.pm
@@ -887,7 +887,6 @@ sub run {
     my $params = Bugzilla->params;
     local $params->{'useclassification'} = 1;
     local $params->{'useqacontact'} = 1;
-    local $params->{'usebugaliases'} = 1;
     local $params->{'usetargetmilestone'} = 1;
     local $params->{'mail_delivery_method'} = 'None';
     local $params->{'timetrackinggroup'} = $everybody->name;