diff options
| -rwxr-xr-x | buglist.cgi | 12 | ||||
| -rwxr-xr-x | process_bug.cgi | 1 | ||||
| -rw-r--r-- | template/en/default/list/edit-multiple.html.tmpl | 6 |
3 files changed, 10 insertions, 9 deletions
diff --git a/buglist.cgi b/buglist.cgi index 4ad0720a9..9f00e15ae 100755 --- a/buglist.cgi +++ b/buglist.cgi @@ -200,12 +200,12 @@ sub GetGroupsByUserId { return if !$userid; SendSQL(" - SELECT groups.id, name, description, isactive - FROM groups, user_group_map - WHERE user_id = $userid AND NOT isbless - AND user_group_map.group_id = groups.id - AND isbuggroup - ORDER BY description "); + SELECT DISTINCT groups.id, name, description, isactive + FROM groups, user_group_map + WHERE user_id = $userid AND NOT isbless + AND user_group_map.group_id = groups.id + AND isbuggroup + ORDER BY description "); my @groups; diff --git a/process_bug.cgi b/process_bug.cgi index 18f18e474..f529f13ea 100755 --- a/process_bug.cgi +++ b/process_bug.cgi @@ -931,6 +931,7 @@ if ($::FORM{'keywords'}) { my $keywordaction = $::FORM{'keywordaction'} || "makeexact"; if ($::comma eq "" + && (! @groupAdd) && (! @groupDel) && (! @::legal_keywords || (0 == @keywordlist && $keywordaction ne "makeexact")) && defined $::FORM{'masscc'} && ! $::FORM{'masscc'} ) { diff --git a/template/en/default/list/edit-multiple.html.tmpl b/template/en/default/list/edit-multiple.html.tmpl index a9088a62d..4121d0292 100644 --- a/template/en/default/list/edit-multiple.html.tmpl +++ b/template/en/default/list/edit-multiple.html.tmpl @@ -182,14 +182,14 @@ [% FOREACH group = groups %] <tr> <td align="center"> - <input type="radio" name="bit-[% group.bit %]" value="-1" checked="checked"> + <input type="radio" name="bit-[% group.id %]" value="-1" checked="checked"> </td> <td align="center"> - <input type="radio" name="bit-[% group.bit %]" value="0"> + <input type="radio" name="bit-[% group.id %]" value="0"> </td> [% IF group.isactive %] <td align="center"> - <input type="radio" name="bit-[% group.bit %]" value="1"> + <input type="radio" name="bit-[% group.id %]" value="1"> </td> [% ELSE %] <td> </td> |