Update of /cvsroot/openinteract/OpenInteract2/pkg/base_template/OpenInteract2/Action
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12116/pkg/base_template/OpenInteract2/Action
Modified Files:
TemplatesUsedBox.pm
Log Message:
update base_template package: don't send '_anonymous_' templates to used box
Index: TemplatesUsedBox.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_template/OpenInteract2/Action/TemplatesUsedBox.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** TemplatesUsedBox.pm 14 Jul 2004 03:21:04 -0000 1.10
--- TemplatesUsedBox.pm 28 Nov 2004 06:40:19 -0000 1.11
***************
*** 21,26 ****
"'", ref( $controller ), "' which should have ",
"OpenInteract2::Controller::ManageTemplates in its \@ISA" );
! return CTX->request->language_handle
! ->maketext( 'base_template.error.no_manage' );
}
my %tmpl_by_package = ();
--- 21,25 ----
"'", ref( $controller ), "' which should have ",
"OpenInteract2::Controller::ManageTemplates in its \@ISA" );
! return $self->_msg( 'base_template.error.no_manage' );
}
my %tmpl_by_package = ();
***************
*** 42,51 ****
$full_name = $template;
}
next if ( $tmpl_used{ $package }{ $name } );
$tmpl_used{ $package }{ $name }++;
! push @{ $tmpl_by_package{ $package } },
! { name => $name,
! package => $package,
! full_name => $full_name };
}
foreach my $package ( keys %tmpl_by_package ) {
--- 41,52 ----
$full_name = $template;
}
+ next if ( $name eq '_anonymous_' );
next if ( $tmpl_used{ $package }{ $name } );
$tmpl_used{ $package }{ $name }++;
! push @{ $tmpl_by_package{ $package } }, {
! name => $name,
! package => $package,
! full_name => $full_name
! };
}
foreach my $package ( keys %tmpl_by_package ) {
***************
*** 83,93 ****
holds a hashref of templates keyed by package. Each value is a an
array reference of hash references, each with the keys: 'name',
! 'package' and 'full_name'. For the default template used for this box
! you would have:
base_template => [
! { name => 'templates_used_box',
! package => 'base_template',
! full_name => 'base_template::templates_used_box' },
],
--- 84,94 ----
holds a hashref of templates keyed by package. Each value is a an
array reference of hash references, each with the keys: 'name',
! 'package' and 'full_name'. For example, the default template used for
! this box you would have:
base_template => [
! { name => 'templates_used_box',
! package => 'base_template',
! full_name => 'base_template::templates_used_box' },
],
|
