[freeside-commits] freeside/httemplate/search/elements search.html, 1.24, 1.25

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/search/elements
In directory wavetail:/tmp/cvs-serv332/httemplate/search/elements

Modified Files:
	search.html 
Log Message:
add menu items for credit card batching, debug last-minute changes to payby.pm, add ACL for re-processing batches, separate CARD and CHEK batches, fixed defaults for batch formats

Index: search.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/elements/search.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- search.html	23 Aug 2006 22:25:38 -0000	1.24
+++ search.html	8 Oct 2006 08:17:06 -0000	1.25
@@ -4,8 +4,13 @@
 %  # (everything not commented required is optional)
 %  #
 %  # # basic options, required
-%  # 'title'       => 'Page title',
-%  # 'name'        => 'items', #name for the records returned
+%  # 'title'         => 'Page title',
+%  # 
+%  # 'name_singular' => 'item',  #singular name for the records returned
+%  #    #OR#                     # (preferred, will be pluralized automatically)
+%  # 'name'          => 'items', #plural name for the records returned
+%  #                             # (deprecated, will be singularlized
+%  #                             #  simplisticly)
 %  #
 %  # # some HTML callbacks...
 %  # 'menubar'          => '', #menubar arrayref
@@ -282,10 +287,18 @@
 %      my( $url, $method ) = @$redirect;
 %      redirect( $url. $rows->[0]->$method() );
 %    } else {
+%      if ( $opt{'name_singular'} ) {
+%        $opt{'name'} = PL($opt{'name_singular'});
+%      }
 %      ( my $xlsname = $opt{'name'} ) =~ s/\W//g;
-%      #$opt{'name'} =~ s/s$// if $total == 1;
-%      $opt{'name'} =~ s/((s)e)?s$/$2/ if $total == 1;  #should use Lingua::bs
-%                                                       # to "depluralize"
+%      if ( $total == 1 ) {
+%        if ( $opt{'name_singular'} ) {
+%          $opt{'name'} = $opt{'name_singular'}
+%        } else {
+%          #$opt{'name'} =~ s/s$// if $total == 1;
+%          $opt{'name'} =~ s/((s)e)?s$/$2/ if $total == 1;
+%        }
+%      }                                               
 %
 %      my @menubar = ();
 %      if ( $opt{'menubar'} ) {