diff options
| -rwxr-xr-x | post_bug.cgi | 28 | ||||
| -rw-r--r-- | template/en/default/bug/create/create.html.tmpl | 13 |
2 files changed, 41 insertions, 0 deletions
diff --git a/post_bug.cgi b/post_bug.cgi index b7fdf66d5..8d21f1505 100755 --- a/post_bug.cgi +++ b/post_bug.cgi @@ -220,6 +220,27 @@ if (defined $::FORM{'cc'}) { } } } +# Check for valid keywords and create list of keywords to be added to db +# (validity routine copied from process_bug.cgi) +my @keywordlist; +my %keywordseen; + +if ($::FORM{'keywords'} && UserInGroup("editbugs")) { + foreach my $keyword (split(/[\s,]+/, $::FORM{'keywords'})) { + if ($keyword eq '') { + next; + } + my $i = GetKeywordIdFromName($keyword); + if (!$i) { + $vars->{'keyword'} = $keyword; + ThrowUserError("unknown_keyword"); + } + if (!$keywordseen{$i}) { + push(@keywordlist, $i); + $keywordseen{$i} = 1; + } + } +} # Build up SQL string to add bug. my $sql = "INSERT INTO bugs " . @@ -281,6 +302,13 @@ foreach my $ccid (keys(%ccids)) { SendSQL("INSERT INTO cc (bug_id, who) VALUES ($id, $ccid)"); } +if (UserInGroup("editbugs")) { + foreach my $keyword (@keywordlist) { + SendSQL("INSERT INTO keywords (bug_id, keywordid) + VALUES ($id, $keyword)"); + } +} + SendSQL("UNLOCK TABLES") if Param("shadowdb"); # Assemble the -force* strings so this counts as "Added to this capacity" diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl index 3e776865b..066c11b63 100644 --- a/template/en/default/bug/create/create.html.tmpl +++ b/template/en/default/bug/create/create.html.tmpl @@ -177,6 +177,19 @@ <br> </td> </tr> + + [% IF UserInGroup('editbugs') %] + <tr> + <td align="right" valign="top"> + <strong> + <a href="describekeywords.cgi">Keywords</a>: + </strong> + </td> + <td colspan="3"> + <input name="keywords" size="60" value=""> (optional) + </td> + </tr> + [% END %] <tr> <td></td> |