From 09ff8eeb2d7a5e92d6a29b99ecaf0984a89db35b Mon Sep 17 00:00:00 2001
From: David Lawrence <dkl@mozilla.com>
Date: Thu, 23 Oct 2014 16:39:52 +0000
Subject: Bug 1062940: Please increase bmo's alias length to match bugzilla 5.0
 (40 chars instead of 20)

---
 Bugzilla/Bug.pm                                 | 2 +-
 Bugzilla/DB/Schema.pm                           | 2 +-
 Bugzilla/Install/DB.pm                          | 3 +++
 template/en/default/bug/create/create.html.tmpl | 2 +-
 template/en/default/bug/edit.html.tmpl          | 4 ++--
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index 39a0f2596..90a9f96bb 100644
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -1423,7 +1423,7 @@ sub _check_alias {
    return undef if (!Bugzilla->params->{'usebugaliases'} || !$alias);
 
     # Make sure the alias isn't too long.
-    if (length($alias) > 20) {
+    if (length($alias) > 40) {
         ThrowUserError("alias_too_long");
     }
     # Make sure the alias isn't just a number.
diff --git a/Bugzilla/DB/Schema.pm b/Bugzilla/DB/Schema.pm
index be392c105..6d7648a3d 100644
--- a/Bugzilla/DB/Schema.pm
+++ b/Bugzilla/DB/Schema.pm
@@ -295,7 +295,7 @@ use constant ABSTRACT_SCHEMA => {
             remaining_time      => {TYPE => 'decimal(7,2)',
                                     NOTNULL => 1, DEFAULT => '0'},
             deadline            => {TYPE => 'DATETIME'},
-            alias               => {TYPE => 'varchar(20)'},
+            alias               => {TYPE => 'varchar(40)'},
         ],
         INDEXES => [
             bugs_alias_idx            => {FIELDS => ['alias'],
diff --git a/Bugzilla/Install/DB.pm b/Bugzilla/Install/DB.pm
index 4fb1f1c83..040be6630 100644
--- a/Bugzilla/Install/DB.pm
+++ b/Bugzilla/Install/DB.pm
@@ -711,6 +711,9 @@ sub update_table_definitions {
                        'bug_user_last_visit_last_visit_ts_idx',
                        ['last_visit_ts']);
 
+    # 2014-10-?? dkl@mozilla.com - Bug 1062940
+    $dbh->bz_alter_column('bugs', 'alias', { TYPE => 'varchar(40)' });
+
     ################################################################
     # New --TABLE-- changes should go *** A B O V E *** this point #
     ################################################################
diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index fa344b1ca..4e37e20bf 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -455,7 +455,7 @@ TUI_hide_default('attachment_text_field');
       field = bug_fields.alias editable = 1
     %]
     <td colspan="2">
-      <input name="alias" size="20" value="[% alias FILTER html %]">
+      <input name="alias" size="30" maxlength="40" value="[% alias FILTER html %]">
     </td>
   </tr>
 [% END %]
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 4f7b8add4..9b039693a 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -276,8 +276,8 @@
             <td colspan="2">
           [% END %]
           [% PROCESS input inputname => "alias" 
-                     size => "20" 
-                     maxlength => "20"  
+                     size => "40"
+                     maxlength => "40"
                      no_td => 1 
                      %][% ")" IF NOT bug.check_can_change_field('alias', 0, 1) 
                                   && bug.alias %]
-- 
cgit v1.2.3-24-g4f1b