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

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

Bug 455583 - Bugzilla::User::can_{set,request}_flag methods should use the…
a9acddbb · dkl%redhat.com · dde670d3 · a9acddbb · a9acddbb
Commit a9acddbb authored Sep 17, 2008 by dkl%redhat.com
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

FlagType.pm Bugzilla/FlagType.pm +2 -0

User.pm Bugzilla/User.pm +4 -4

No files found.
--- 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         ####

--- 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
+            || !$flag_type->request_group_id
-            || $self->in_group_id($flag_type->request_group->id)) ? 1 : 0;
+            || $self->in_group_id($flag_type->request_group_id)) ? 1 : 0;
 }
 sub can_set_flag {
    my ($self, $flag_type) = @_;
-    return (!$flag_type->grant_group
+    return (!$flag_type->grant_group_id
-            || $self->in_group_id($flag_type->grant_group->id)) ? 1 : 0;
+            || $self->in_group_id($flag_type->grant_group_id)) ? 1 : 0;
 }
 sub direct_group_membership {