Bug 576916: 'keywordaction' is undefined when editing a single bug

r/a=mkanat

diff --git a/process_bug.cgi b/process_bug.cgi
index f6da2af611d2af30105803176d5a4ff3ef51f8c5..7126d5d8b7c4c88fa02bccc69e3d92537b40f80d 100755 (executable)
--- a/process_bug.cgi
+++ b/process_bug.cgi
@@ -258,7 +258,8 @@ foreach my $field_name (@set_fields) {
 }
 
 if (should_set('keywords')) {
-    my $action = $cgi->param('keywordaction');
+    my $action = $cgi->param('keywordaction') || '';
+    # Backward-compatibility for Bugzilla 3.x and older.
     $action = 'remove' if $action eq 'delete';
     $action = 'set'    if $action eq 'makeexact';
     $set_all_fields{keywords}->{$action} = $cgi->param('keywords');

diff --git a/template/en/default/list/edit-multiple.html.tmpl b/template/en/default/list/edit-multiple.html.tmpl
index 03e1395a1b8f7742eb58fae7009662336206137e..736f2c71a2647cb5068f25edf58c20d9d6001fe8 100644 (file)
--- a/template/en/default/list/edit-multiple.html.tmpl
+++ b/template/en/default/list/edit-multiple.html.tmpl
@@ -230,8 +230,8 @@
         %]
         <select name="keywordaction">
           <option value="add">Add these keywords</option>
-          <option value="delete">Delete these keywords</option>
-          <option value="makeexact">Make the keywords be exactly this list</option>
+          <option value="remove">Delete these keywords</option>
+          <option value="set">Make the keywords be exactly this list</option>
         </select>
       </td>