summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrédéric Buclin <LpSolit@gmail.com>2010-07-06 02:49:09 +0200
committerFrédéric Buclin <LpSolit@gmail.com>2010-07-06 02:49:09 +0200
commit122c0407902c08b974ac552898a3bed3a2025a7d (patch)
tree55b559a29a6e2e1f7c7c517ed6f6296cade30918
parent108eb83fae1e54f9746698246551e188dede26cb (diff)
downloadbugzilla-122c0407902c08b974ac552898a3bed3a2025a7d.tar.gz
bugzilla-122c0407902c08b974ac552898a3bed3a2025a7d.tar.xz
Bug 576916: 'keywordaction' is undefined when editing a single bug
r/a=mkanat
-rwxr-xr-xprocess_bug.cgi3
-rw-r--r--template/en/default/list/edit-multiple.html.tmpl4
2 files changed, 4 insertions, 3 deletions
diff --git a/process_bug.cgi b/process_bug.cgi
index f6da2af61..7126d5d8b 100755
--- 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 03e1395a1..736f2c71a 100644
--- 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>