Bug 188161 - assignee/qa missing change knobs.

r, a=justdave

diff --git a/Bug.pm b/Bug.pm
index 251ad16e2d3cbb58bbee9c07d01c3569dd72b829..35f8402ef844fcb51a549e7f895e181815af687a 100755 (executable)
--- a/Bug.pm
+++ b/Bug.pm
@@ -373,9 +373,9 @@ sub user {
     # in the world; their permissions will get checked when they log in
     # and actually try to make the change.
     $self->{'user'}->{'canedit'} = $::userid == 0
-                                   || $::userid == $self->{'reporter'}
-                                   || $::userid == $self->{'qa_contact'}
-                                   || $::userid == $self->{'assigned_to'}
+                                   || $::userid == $self->{'reporter'}{'id'}
+                                   || ($self->{'qa_contact'} && $::userid == $self->{'qa_contact'}{'id'})
+                                   || $::userid == $self->{'assigned_to'}{'id'}
                                    || &::UserInGroup("editbugs");
     $self->{'user'}->{'canconfirm'} = ($::userid == 0)
                                    || &::UserInGroup("canconfirm")

diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index 251ad16e2d3cbb58bbee9c07d01c3569dd72b829..35f8402ef844fcb51a549e7f895e181815af687a 100755 (executable)
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -373,9 +373,9 @@ sub user {
     # in the world; their permissions will get checked when they log in
     # and actually try to make the change.
     $self->{'user'}->{'canedit'} = $::userid == 0
-                                   || $::userid == $self->{'reporter'}
-                                   || $::userid == $self->{'qa_contact'}
-                                   || $::userid == $self->{'assigned_to'}
+                                   || $::userid == $self->{'reporter'}{'id'}
+                                   || ($self->{'qa_contact'} && $::userid == $self->{'qa_contact'}{'id'})
+                                   || $::userid == $self->{'assigned_to'}{'id'}
                                    || &::UserInGroup("editbugs");
     $self->{'user'}->{'canconfirm'} = ($::userid == 0)
                                    || &::UserInGroup("canconfirm")