1160430 - Backport bug 69267 to BMO (Add the ability to deactivate keywords)

Status: RESOLVED FIXED

(bugzilla.mozilla.org :: General, defect)

Description

[Dylan Hardison [:dylan] (he/him)]

SSIA

Comment 1

[Dylan Hardison [:dylan] (he/him)]

Attachment: 1160430_3.patch

After a minor amount of discomfort from how far differences between bmo and upstream, this is ready for review.

Comment 2

[:glob ✱]

Comment on attachment 8601484 [details] [diff] [review]
1160430_3.patch

Review of attachment 8601484 [details] [diff] [review]:
-----------------------------------------------------------------

r=glob, fix the issues on commit

** just commit the changes to Schema.pm and DB.pm ** and leave the bug open.  i'll commit the rest after i've pushed the schema changes to prod.

::: Bugzilla/Install/DB.pm
@@ +721,4 @@
>      # 2014-10-?? [e-mail] - Bug 1062940
>      $dbh->bz_alter_column('bugs', 'alias', { TYPE => 'varchar(40)' });
>  
> +    # 2014-11-18 [e-mail] - Bug 69267

neither the date or bug number are correct

::: editkeywords.cgi
@@ +82,5 @@
>  #
>  if ($action eq 'new') {
>      check_token_data($token, 'add_keyword');
> +    my $name      = $cgi->param('name') || '';
> +    my $is_active = $cgi->param('is_active');

is_active isn't on the form, and isn't used.

@@ +88,3 @@
>  
>      my $keyword = Bugzilla::Keyword->create(
>          { name => $name, description => $desc });

for clarity pass in | is_active => 1 | to the constructor

::: template/en/default/global/user-error.html.tmpl
@@ +1401,4 @@
>        Either you mis-typed the name or that user has not yet registered
>        for a [% terms.Bugzilla %] account.
>      [% ELSIF class == "Bugzilla::Keyword" %]
> +      The legal keyword names are <a href="describekeywords.cgi?show_inactive_keywords=1">listed

use upstream's wording of this error, it's much clearer

::: template/en/default/reports/keywords.html.tmpl
@@ +34,5 @@
>    title = "$terms.Bugzilla Keyword Descriptions"
>  %]
>  
> +<script>
> + $(document).ready(function () {

nit: indentation here is off

@@ +52,5 @@
> +             link.html("Show inactive keywords");
> +         }
> +         event.preventDefault();
> +     }).click();
> + });

.. and here

Comment 3

[Dylan Hardison [:dylan] (he/him)]

schema only

To ssh://[e-mail]/webtools/bmo/bugzilla.git
   0622523..bdaf609  master -> master

Comment 4

[Dylan Hardison [:dylan] (he/him)]

Attachment: 1160430_4.patch

Patch to commit (everything *except* the schema changes, which were commited)

Comment 5

[:glob ✱]

Comment on attachment 8605418 [details] [diff] [review]
1160430_4.patch

this isn't a valid patch

Comment 6

[:glob ✱]

To ssh://[e-mail]/webtools/bmo/bugzilla.git
   1e23e69..64fd94e  master -> master