Bug 455583 - Bugzilla::User::can_{set,request}_flag methods should use the respective...

Patch by David Lawrence <dkl@redhat.com> - r/a=LpSolit

diff --git a/Bugzilla/FlagType.pm b/Bugzilla/FlagType.pm
index ffa36863ef3c508d188ba5c944a4bb69db3fe086..2892a8392cb8df664502c57689c6f1df90f10b83 100644 (file)
--- 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 f5b5030951bed7709c642dc57c6e82da310b3b5b..91240e1ceb27dab884fc5300eb092f0047a843c2 100644 (file)
--- a/Bugzilla/User.pm
+++ b/Bugzilla/User.pm
@@ -775,15 +775,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 {