[Openinteract-commits] CVS: OpenInteract2/pkg/base_template/OpenInteract2/Action SiteTemplate.pm,1.13,1.14

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

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

Modified Files:
	SiteTemplate.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: SiteTemplate.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_template/OpenInteract2/Action/SiteTemplate.pm,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** SiteTemplate.pm	22 May 2004 15:04:36 -0000	1.13
--- SiteTemplate.pm	5 Dec 2004 08:51:20 -0000	1.14
***************
*** 18,23 ****
      $log ||= get_logger( LOG_APP );
  
!     $log->is_info &&
!         $log->info( "Listing templates in system" );
      my $website_dir = CTX->lookup_directory( 'website' );
      my $packages = CTX->repository->fetch_all_packages();
--- 18,22 ----
      $log ||= get_logger( LOG_APP );
  
!     $log->is_info && $log->info( "Listing templates in system" );
      my $website_dir = CTX->lookup_directory( 'website' );
      my $packages = CTX->repository->fetch_all_packages();
***************
*** 30,36 ****
          };
          if ( $@ ) {
!             my $msg = "Failed to fetch templates in " . $pkg->name . ": $@";
              $log->error( $msg );
-             $self->param_add( error_msg => $msg );
          }
      }
--- 29,34 ----
          };
          if ( $@ ) {
!             my $msg = $self->add_error_key( '', $pkg->name, $@ );
              $log->error( $msg );
          }
      }
***************
*** 41,47 ****
      };
      if ( $@ ) {
!         my $msg = "Failed to get global templates: $@";
          $log->error( $msg );
-         $self->param_add( error_msg => $msg );
      }
      return $self->generate_content(
--- 39,44 ----
      };
      if ( $@ ) {
!         my $msg = $self->add_error_key( 'base_template.error.fetch_global', $@ );
          $log->error( $msg );
      }
      return $self->generate_content(
***************
*** 77,83 ****
              $template = eval { $tmpl_class->fetch( $fq_name ) };
              if ( $@ || ! $template ) {
!                 my $error = $@ || 'not found';
!                 $self->param_add(
!                     error_msg => "Failed to fetch template [$fq_name]: $error" );
                  return $self->execute({ task => 'list' });
              }
--- 74,83 ----
              $template = eval { $tmpl_class->fetch( $fq_name ) };
              if ( $@ || ! $template ) {
!                 if ( $@ ) {
!                     $self->add_error_key( 'base_template.error.fetch', $fq_name, $@ );
!                 }
!                 else {
!                     $self->add_error_key( 'base_template.error.does_not_exist', $fq_name );
!                 }
                  return $self->execute({ task => 'list' });
              }
***************
*** 112,119 ****
      $log ||= get_logger( LOG_APP );
  
!     $log->is_info &&
!         $log->info( "Updating existing template" );
      CTX->response->return_url(
!         OpenInteract2::URL->create_from_action( 'template' ) );
  
      my $request = CTX->request;
--- 112,119 ----
      $log ||= get_logger( LOG_APP );
  
!     $log->is_info && $log->info( "Updating existing template" );
      CTX->response->return_url(
!         OpenInteract2::URL->create_from_action( 'template' )
!     );
  
      my $request = CTX->request;
***************
*** 125,131 ****
      my $template = eval { $tmpl_class->fetch( $fq_name ) };
      if ( $@ or ! $template ) {
!         my $error = $@ || 'not found';
!         $self->param_add(
!             error_msg => "Failed to fetch template [$fq_name]: $error" );
          return $self->execute({ task => 'list' });
      }
--- 125,134 ----
      my $template = eval { $tmpl_class->fetch( $fq_name ) };
      if ( $@ or ! $template ) {
!         if ( $@ ) {
!             $self->add_error_key( 'base_template.error.fetch', $fq_name, $@ );
!         }
!         else {
!             $self->add_error_key( 'base_template.error.does_not_exist', $fq_name );
!         }
          return $self->execute({ task => 'list' });
      }
***************
*** 135,139 ****
      eval { $template->save };
      if ( $@ ) {
!         $self->param_add( error_msg => "Failed to save template: $@" );
          $self->param( template => $template );
          return $self->execute({ task => 'display_form' });
--- 138,142 ----
      eval { $template->save };
      if ( $@ ) {
!         $self->add_error_key( 'base_template.error.save', $@ );
          $self->param( template => $template );
          return $self->execute({ task => 'display_form' });
***************
*** 141,145 ****
      else {
          my $new_name = $template->create_name;
!         $self->param_add( status_msg => "Template $new_name saved ok" );
          return $self->execute({ task => 'list' });
      }
--- 144,148 ----
      else {
          my $new_name = $template->create_name;
!         $self->add_status_key( 'base_template.status.update', $new_name );
          return $self->execute({ task => 'list' });
      }
***************
*** 173,178 ****
      my $existing_template = eval { $tmpl_class->fetch( $fq_name ) };
      if ( $existing_template ) {
!         $self->param_add(
!             error_msg => "Template [$fq_name] already exists, cannot create" );
          return $self->execute({ task => 'display_add' });
      }
--- 176,180 ----
      my $existing_template = eval { $tmpl_class->fetch( $fq_name ) };
      if ( $existing_template ) {
!         $self->add_error_key( 'base_template.error.create_exists', $fq_name );
          return $self->execute({ task => 'display_add' });
      }
***************
*** 180,188 ****
      eval { $template->save };
      if ( $@ ) {
!         $self->param_add( error_msg => "Failed to create template: $@" );
          return $self->execute({ task => 'display_add' });
      }
      else {
!         $self->param_add( status_msg => "Template $fq_name saved ok" );
          return $self->execute({ task => 'list' });
      }
--- 182,190 ----
      eval { $template->save };
      if ( $@ ) {
!         $self->add_error_key( 'base_template.error.create', $fq_name, $@ );
          return $self->execute({ task => 'display_add' });
      }
      else {
!         $self->add_status_key( 'base_template.status.create', $fq_name );
          return $self->execute({ task => 'list' });
      }
***************
*** 210,215 ****
          $template = eval { $tmpl_class->fetch( $fq_name ) };
          if ( $@ ) {
!             $self->param_add(
!                 error_msg => "Cannot fetch template [$fq_name]: $@" );
              return $self->execute({ task => 'list' });
          }
--- 212,216 ----
          $template = eval { $tmpl_class->fetch( $fq_name ) };
          if ( $@ ) {
!             $self->add_error_key( 'base_template.error.fetch', $fq_name, $@ );
              return $self->execute({ task => 'list' });
          }
***************
*** 218,232 ****
          eval { $template->remove };
          if ( $@ ) {
!             $self->param_add(
!                 error_msg => "Error removing template $fq_name: $@" );
          }
          else {
!             $self->param_add(
!                 status_msg => "Template $fq_name removed ok" );
          }
      }
      else {
!         $self->param_add(
!             error_msg => "Template [$fq_name] does not seem to exist" );
      }
      return $self->execute({ task => 'list' });
--- 219,230 ----
          eval { $template->remove };
          if ( $@ ) {
!             $self->add_error_key( 'base_template.error.remove', $fq_name, $@ );
          }
          else {
!             $self->add_status_key( 'base_template.status.remove', $fq_name );
          }
      }
      else {
!         $self->add_error_key( 'base_template.error.does_not_exist', $fq_name );
      }
      return $self->execute({ task => 'list' });