[Openinteract-commits] CVS: OpenInteract2/pkg/base_group/OpenInteract2/Action Group.pm,1.9,1.10

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/pkg/base_group/OpenInteract2/Action
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16278/pkg/base_group/OpenInteract2/Action

Modified Files:
	Group.pm 
Log Message:
update packages to move as many messages as possible out of code and into message files; use new add_status/add_error shortcuts

Index: Group.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_group/OpenInteract2/Action/Group.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Group.pm	6 Jun 2004 06:08:59 -0000	1.9
--- Group.pm	5 Dec 2004 08:51:19 -0000	1.10
***************
*** 30,36 ****
      };
      if ( $@ ) {
!         my $msg = "Failed to retrieve groups: $@";
!         $log->error( $msg );
!         $self->param_add( error_msg => $msg );
      }
      my %params = (
--- 30,35 ----
      };
      if ( $@ ) {
!         $log->error( "Canot fetch groups: $@" );
!         $self->add_error_key( 'base_group.error.failed_fetch', $@ );
      }
      my %params = (
***************
*** 79,84 ****
      };
      if ( $@ ) {
!         $log->error( "Failed to retrieve all users: $@" );
!         $self->param_add( error_msg => "Failed to retrieve all users: $@" );
      }
      else {
--- 78,83 ----
      };
      if ( $@ ) {
!         my $e = $self->add_error_key( 'base_group.error.failed_member_fetch', $@ );
!         $log->error( $e );
      }
      else {
***************
*** 102,109 ****
      my $members = eval { $group->user };
      if ( $@ ) {
!         my $msg = "Failed to retrieve members: $@";
!         $log->error( $msg );
!         $self->param_add( error_msg => $msg );
!         oi_error $msg;
      }
      return map { { id   => $_->id,
--- 101,107 ----
      my $members = eval { $group->user };
      if ( $@ ) {
!         my $e = $self->add_error_key( 'base_group.error.failed_member_fetch', $@ );
!         $log->error( "Cannot fetch group members: $@" );
!         oi_error $e;
      }
      return map { { id   => $_->id,
***************
*** 149,159 ****
      if ( $@ ) {
          $log->error( "Error removing users from group: $@" );
!         $self->param_add(
!             error_msg => "Failed to remove user members: $@" );
!         die $self->execute({ task => 'display_form' });
      }
      my $num_to_remove = scalar @{ $member_status->{remove} };
      $log->is_debug &&
!         $log->debug( "Removed [$removed] of [$num_to_remove]" );
  
      my $added   = eval {
--- 147,156 ----
      if ( $@ ) {
          $log->error( "Error removing users from group: $@" );
!         $self->add_error_key( 'base_group.error.failed_member_remove', $@ );
!         die $self->execute({ task => 'display_form' }), "\n";
      }
      my $num_to_remove = scalar @{ $member_status->{remove} };
      $log->is_debug &&
!         $log->debug( "Removed '$removed' of '$num_to_remove'" );
  
      my $added   = eval {
***************
*** 162,174 ****
      if ( $@ ) {
          $log->error( "Error adding users to group: $@" );
!         $self->param_add(
!             error_msg => "Failed to add user members: $@" );
!         die $self->execute({ task => 'display_form' });
      }
      my $num_to_add = scalar @{ $member_status->{add} };
      $log->is_debug &&
!         $log->debug( "Added [$added] of [$num_to_add]" );
!     $self->param_add( status_msg => "Group membership information updated: " .
!                                     "added $added; removed $removed" );
      return undef;
  }
--- 159,169 ----
      if ( $@ ) {
          $log->error( "Error adding users to group: $@" );
!         $self->add_error_key( 'base_group.error.failed_member_remove', $@ );
!         die $self->execute({ task => 'display_form' }), "\n";
      }
      my $num_to_add = scalar @{ $member_status->{add} };
      $log->is_debug &&
!         $log->debug( "Added '$added' of '$num_to_add'" );
!     $self->add_status_key( 'base_group.status.update_ok', $added, $removed );
      return undef;
  }