From 5b3ea4d476084d47c99e3d2e9d409fea84c16831 Mon Sep 17 00:00:00 2001 From: Reed Loden Date: Tue, 26 Jun 2012 17:20:26 +0200 Subject: Bug 138546: Add a checkbox to add himself to the CC list when creating or editing an attachment r/a=LpSolit --- Bugzilla/Bug.pm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'Bugzilla') diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm index 1bf5a11cd..3d9689aca 100644 --- a/Bugzilla/Bug.pm +++ b/Bugzilla/Bug.pm @@ -3614,23 +3614,23 @@ sub user { return {} if $self->{'error'}; my $user = Bugzilla->user; - my $prod_id = $self->{'product_id'}; - my $unknown_privileges = $user->in_group('editbugs', $prod_id); - my $canedit = $unknown_privileges - || $user->id == $self->{'assigned_to'} - || (Bugzilla->params->{'useqacontact'} - && $self->{'qa_contact'} - && $user->id == $self->{'qa_contact'}); - my $canconfirm = $unknown_privileges - || $user->in_group('canconfirm', $prod_id); - my $isreporter = $user->id - && $user->id == $self->{reporter_id}; + my $editbugs = $user->in_group('editbugs', $prod_id); + my $is_reporter = $user->id == $self->{reporter_id} ? 1 : 0; + my $is_assignee = $user->id == $self->{'assigned_to'} ? 1 : 0; + my $is_qa_contact = Bugzilla->params->{'useqacontact'} + && $self->{'qa_contact'} + && $user->id == $self->{'qa_contact'} ? 1 : 0; + + my $canedit = $editbugs || $is_assignee || $is_qa_contact; + my $canconfirm = $editbugs || $user->in_group('canconfirm', $prod_id); + my $has_any_role = $is_reporter || $is_assignee || $is_qa_contact; $self->{'user'} = {canconfirm => $canconfirm, canedit => $canedit, - isreporter => $isreporter}; + isreporter => $is_reporter, + has_any_role => $has_any_role}; return $self->{'user'}; } -- cgit v1.2.3-24-g4f1b