summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkl%redhat.com <>2008-09-17 10:47:36 +0200
committerdkl%redhat.com <>2008-09-17 10:47:36 +0200
commita9acddbb45663924f9a1d8472ed07ab13d45c073 (patch)
treef6dd0348171ce1063c99ea15665c173b8b00bb3d
parentdde670d3493e9f9eb722cd3b1b9337879e51144b (diff)
downloadbugzilla-a9acddbb45663924f9a1d8472ed07ab13d45c073.tar.gz
bugzilla-a9acddbb45663924f9a1d8472ed07ab13d45c073.tar.xz
Bug 455583 - Bugzilla::User::can_{set,request}_flag methods should use the respective {grant,request}_group_id values instead of loading new Group object
Patch by David Lawrence <dkl@redhat.com> - r/a=LpSolit
-rw-r--r--Bugzilla/FlagType.pm2
-rw-r--r--Bugzilla/User.pm8
2 files changed, 6 insertions, 4 deletions
diff --git a/Bugzilla/FlagType.pm b/Bugzilla/FlagType.pm
index ffa36863e..2892a8392 100644
--- a/Bugzilla/FlagType.pm
+++ b/Bugzilla/FlagType.pm
@@ -177,6 +177,8 @@ sub is_requestable { return $_[0]->{'is_requestable'}; }
sub is_requesteeble { return $_[0]->{'is_requesteeble'}; }
sub is_multiplicable { return $_[0]->{'is_multiplicable'}; }
sub sortkey { return $_[0]->{'sortkey'}; }
+sub request_group_id { return $_[0]->{'request_group_id'}; }
+sub grant_group_id { return $_[0]->{'grant_group_id'}; }
###############################
#### Methods ####
diff --git a/Bugzilla/User.pm b/Bugzilla/User.pm
index 7f59b749c..f495132b1 100644
--- a/Bugzilla/User.pm
+++ b/Bugzilla/User.pm
@@ -796,15 +796,15 @@ sub can_request_flag {
my ($self, $flag_type) = @_;
return ($self->can_set_flag($flag_type)
- || !$flag_type->request_group
- || $self->in_group_id($flag_type->request_group->id)) ? 1 : 0;
+ || !$flag_type->request_group_id
+ || $self->in_group_id($flag_type->request_group_id)) ? 1 : 0;
}
sub can_set_flag {
my ($self, $flag_type) = @_;
- return (!$flag_type->grant_group
- || $self->in_group_id($flag_type->grant_group->id)) ? 1 : 0;
+ return (!$flag_type->grant_group_id
+ || $self->in_group_id($flag_type->grant_group_id)) ? 1 : 0;
}
sub direct_group_membership {