Skip to content

bugzilla
bugzilla
Commit 5a8548ce authored by gerv%gerv.net's avatar gerv%gerv.net
Browse files
Options

Bug 186994 - Unable to accept a new bug that has been assigned. Patch by gerv;…

Bug 186994 - Unable to accept a new bug that has been assigned. Patch by gerv; r=bbaetz, a=justdave.
parent 550ffb9f
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 14 deletions
Bug.pm
View file @ 5a8548ce
...@@ -379,9 +379,11 @@ sub user { ...@@ -379,9 +379,11 @@ sub user {
|| ($self->{'qa_contact'} && $::userid == $self->{'qa_contact'}{'id'}) || ($self->{'qa_contact'} && $::userid == $self->{'qa_contact'}{'id'})
|| $::userid == $self->{'assigned_to'}{'id'} || $::userid == $self->{'assigned_to'}{'id'}
|| &::UserInGroup("editbugs"); || &::UserInGroup("editbugs");
$self->{'user'}->{'canconfirm'} = ($::userid == 0) $self->{'user'}->{'canconfirm'} = $::userid == 0
|| &::UserInGroup("canconfirm") || ($self->{'qa_contact'} && $::userid == $self->{'qa_contact'}{'id'})
|| &::UserInGroup("editbugs"); || $::userid == $self->{'assigned_to'}{'id'}
|| &::UserInGroup("editbugs")
|| &::UserInGroup("canconfirm");
return $self->{'user'}; return $self->{'user'};
} }
......
Bugzilla/Bug.pm
View file @ 5a8548ce
...@@ -379,9 +379,11 @@ sub user { ...@@ -379,9 +379,11 @@ sub user {
|| ($self->{'qa_contact'} && $::userid == $self->{'qa_contact'}{'id'}) || ($self->{'qa_contact'} && $::userid == $self->{'qa_contact'}{'id'})
|| $::userid == $self->{'assigned_to'}{'id'} || $::userid == $self->{'assigned_to'}{'id'}
|| &::UserInGroup("editbugs"); || &::UserInGroup("editbugs");
$self->{'user'}->{'canconfirm'} = ($::userid == 0) $self->{'user'}->{'canconfirm'} = $::userid == 0
|| &::UserInGroup("canconfirm") || ($self->{'qa_contact'} && $::userid == $self->{'qa_contact'}{'id'})
|| &::UserInGroup("editbugs"); || $::userid == $self->{'assigned_to'}{'id'}
|| &::UserInGroup("editbugs")
|| &::UserInGroup("canconfirm");
return $self->{'user'}; return $self->{'user'};
} }
......
process_bug.cgi
View file @ 5a8548ce
...@@ -310,7 +310,9 @@ my $qacontactid; ...@@ -310,7 +310,9 @@ my $qacontactid;
################################################################################ ################################################################################
# CheckCanChangeField() defines what users are allowed to change what bugs. You # CheckCanChangeField() defines what users are allowed to change what bugs. You
# can add code here for site-specific policy changes, according to the # can add code here for site-specific policy changes, according to the
# instructions given in the Bugzilla Guide and below. # instructions given in the Bugzilla Guide and below. Note that you may also
# have to update the Bug::user() function to give people access to the options
# that they are permitted to change.
# #
# CheckCanChangeField() should return true if the user is allowed to change this # CheckCanChangeField() should return true if the user is allowed to change this
# field, and false if they are not. # field, and false if they are not.
...@@ -527,13 +529,7 @@ sub DoComma { ...@@ -527,13 +529,7 @@ sub DoComma {
} }
sub DoConfirm { sub DoConfirm {
if ($UserInEditGroupSet < 0) { if (CheckCanChangeField("canconfirm", $::FORM{'id'}, 0, 1)) {
$UserInEditGroupSet = UserInGroup("editbugs");
}
if ($UserInCanConfirmGroupSet < 0) {
$UserInCanConfirmGroupSet = UserInGroup("canconfirm");
}
if ($UserInEditGroupSet || $UserInCanConfirmGroupSet) {
DoComma(); DoComma();
$::query .= "everconfirmed = 1"; $::query .= "everconfirmed = 1";
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment