[Rt-commit] r18955 - rt/3.999/trunk/lib/RT/Model

[ruz at bestpractical.com]

Author: ruz
Date: Fri Mar 27 13:39:30 2009
New Revision: 18955

Modified:
   rt/3.999/trunk/lib/RT/Model/User.pm

Log:
* adjust to new api of *member* methods

Modified: rt/3.999/trunk/lib/RT/Model/User.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/Model/User.pm	(original)
+++ rt/3.999/trunk/lib/RT/Model/User.pm	Fri Mar 27 13:39:30 2009
@@ -50,7 +50,7 @@
 
 package RT::Model::User;
 
-use base qw/RT::IsPrincipal RT::Record/;
+use base qw/RT::IsPrincipal::HasNoMembers RT::Record/;
 
 =head1 NAME
 
@@ -261,9 +261,7 @@
         return ( 0, _('Could not create user') );
     }
 
-    my ( $everyone_id, $everyone_msg ) = $everyone->_add_member(
-        principal_id       => $self->principal_id
-    );
+    my ( $everyone_id, $everyone_msg ) = $everyone->_add_member( principal => $self );
     unless ($everyone_id) {
         Jifty->log->fatal("Could not add user to Everyone group on user creation.");
         Jifty->log->fatal($everyone_msg);
@@ -284,9 +282,7 @@
         return ( 0, _('Could not create user') );
     }
 
-    my ( $ac_id, $ac_msg ) = $access_class->_add_member(
-        principal_id       => $self->principal_id
-    );
+    my ( $ac_id, $ac_msg ) = $access_class->_add_member( principal => $self );
 
     unless ($ac_id) {
         Jifty->log->fatal( "Could not add user to privileged or Unprivileged group on user creation. aborted" );
@@ -344,12 +340,12 @@
     }
 
     if ($val) {
-        if ( $priv->has_member( $self->principal ) ) {
+        if ( $priv->has_member( principal =>  $self->principal ) ) {
 
             #Jifty->log->debug("That user is already privileged");
             return ( 0, _("That user is already privileged") );
         }
-        if ( $unpriv->has_member( $self->principal ) ) {
+        if ( $unpriv->has_member( principal =>  $self->principal ) ) {
             $unpriv->_delete_member( $self->principal_id );
         } else {
 
@@ -358,21 +354,19 @@
             # bogus happened
             Jifty->log->fatal( "User " . $self->id . " is neither privileged nor " . "unprivileged. something is drastically wrong." );
         }
-        my ( $status, $msg ) = $priv->_add_member(
-            principal_id       => $self->principal_id
-        );
+        my ( $status, $msg ) = $priv->_add_member( principal => $self );
         if ($status) {
             return ( 1, _("That user is now privileged") );
         } else {
             return ( 0, $msg );
         }
     } else {
-        if ( $unpriv->has_member( $self->principal ) ) {
+        if ( $unpriv->has_member( principal =>  $self->principal ) ) {
 
             #Jifty->log->debug("That user is already unprivileged");
             return ( 0, _("That user is already unprivileged") );
         }
-        if ( $priv->has_member( $self->principal ) ) {
+        if ( $priv->has_member( principal =>  $self->principal ) ) {
             $priv->_delete_member( $self->principal_id );
         } else {
 
@@ -381,9 +375,7 @@
             # bogus happened
             Jifty->log->fatal( "User " . $self->id . " is neither privileged nor " . "unprivileged. something is drastically wrong." );
         }
-        my ( $status, $msg ) = $unpriv->_add_member(
-            principal_id       => $self->principal_id
-        );
+        my ( $status, $msg ) = $unpriv->_add_member( principal => $self );
         if ($status) {
             return ( 1, _("That user is now unprivileged") );
         } else {
@@ -403,7 +395,7 @@
     my $self = shift;
     my $priv = RT::Model::Group->new( current_user => $self->current_user );
     $priv->load_system_internal('privileged');
-    if ( $priv->has_member( $self->principal ) ) {
+    if ( $priv->has_member( principal =>  $self->principal ) ) {
         return (1);
     } else {
         return (undef);