X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fsearch%2Felements%2Fsearch.html;h=12ab83ba52e20429910fd604893048c10b0f2de4;hp=37a3718ce2efc714a469a3a242749086345cdb85;hb=d8ff6db2dbaec9cc8daad2d4af0254f167aa7a66;hpb=5cd995865b91204f7ce9233a8ba4d5eee62f9be4

diff --git a/httemplate/search/elements/search.html b/httemplate/search/elements/search.html
index 37a3718ce..12ab83ba5 100644
--- a/httemplate/search/elements/search.html
+++ b/httemplate/search/elements/search.html
@@ -50,11 +50,11 @@
     $header ||= $sth->{NAME};
   }
 
-  if ( exists($opt{'redirect'}) && scalar(@$rows) == 1 ) {
+  if ( exists($opt{'redirect'}) && scalar(@$rows) == 1 && $total == 1 ) {
     my( $url, $method ) = @{$opt{'redirect'}};
     redirect( $url. $rows->[0]->$method() );
   } else {
-
+    $opt{'name'} =~ s/s$// if $total == 1;
 %>
 <%= include( '/elements/header.html', $opt{'title'},
                include( '/elements/menubar.html', 'Main menu' => $p )
@@ -67,47 +67,60 @@
                            'maxrecords' => $maxrecords,
                        );
 %>
-<%= $total %> total <%= $opt{'name'} %><BR>
-<% if ( $opt{'count_addl'} ) { %>
-  <% my $n=0; foreach my $count ( @{$opt{'count_addl'}} ) { %>
-    <%= sprintf( $count, $count_arrayref->[++$n] ) %><BR>
-  <% } %>
-<% } %>
-<BR><%= $pager %>
-<%= include( '/elements/table.html' ) %>
-  <TR>
-  <% foreach my $header ( @$header ) { %>
-       <TH><%= $header %></TH>
+<% unless ( $total ) { %>
+  No matching <%= $opt{'name'} %> found.<BR>
+<% } else { %>
+  <%= $total %> total <%= $opt{'name'} %><BR>
+  <% if ( $opt{'count_addl'} ) { %>
+    <% my $n=0; foreach my $count ( @{$opt{'count_addl'}} ) { %>
+      <%= sprintf( $count, $count_arrayref->[++$n] ) %><BR>
+    <% } %>
   <% } %>
-  </TR>
-  <% foreach my $row ( @$rows ) { %>
-       <TR>
-       <% if ( $opt{'fields'} ) { %>
-         <% my $links = $opt{'links'} ? [ @{$opt{'links'}} ] : ''; %>
-         <% foreach my $field ( @{$opt{'fields'}} ) { %>
-           <% my $a = ''; %>
-           <% if ( $links ) {
-                my( $url, $method ) = @{shift @$links};
-                $a = $url. $row->$method();
-                $a = qq(<A HREF="$a">);
-              }
-           %>
-           <% if ( ref($field) eq 'CODE' ) { %>
-             <TD><%= $a %><%= &{$field}($row) %><%= $a ? '</A>' : '' %></TD>
-           <% } else { %>
-             <TD><%= $a %><%= $row->$field() %><%= $a ? '</A>' : '' %></TD>
+  <BR><%= $pager %>
+  <%= include( '/elements/table.html' ) %>
+    <TR>
+    <% foreach my $header ( @$header ) { %>
+         <TH><%= $header %></TH>
+    <% } %>
+    </TR>
+    <% foreach my $row ( @$rows ) { %>
+         <TR>
+         <% if ( $opt{'fields'} ) { %>
+           <% my $links = $opt{'links'} ? [ @{$opt{'links'}} ] : ''; %>
+           <% foreach my $field ( @{$opt{'fields'}} ) { %>
+             <% my $a = ''; %>
+             <% if ( $links ) {
+                  my $link = shift @$links;
+                  $link = &{$link}($row) if ref($link) eq 'CODE';
+                  if ( $link ) {
+                    my( $url, $method ) = @{$link};
+                    if ( ref($method) eq 'CODE' ) {
+                      $a = $url. &{$method}($row);
+                    } else {
+                      $a = $url. $row->$method();
+                    }
+                    $a = qq(<A HREF="$a">);
+                  }
+                }
+             %>
+             <% if ( ref($field) eq 'CODE' ) { %>
+               <TD><%= $a %><%= &{$field}($row) %><%= $a ? '</A>' : '' %></TD>
+             <% } else { %>
+               <TD><%= $a %><%= $row->$field() %><%= $a ? '</A>' : '' %></TD>
+             <% } %>
+           <% } %>
+         <% } else { %>
+           <% foreach ( @$row ) { %>
+                <TD><%= $_ %></TD>
            <% } %>
          <% } %>
-       <% } else { %>
-         <% foreach ( @$row ) { %>
-              <TD><%= $_ %></TD>
-         <% } %>
-       <% } %>
-       </TR>
-  <% } %>
-
-</TABLE>
-<%= $pager %>
+         </TR>
+    <% } %>
+  
+  </TABLE>
+  <%= $pager %>
+<% } %>
 </BODY>
 </HTML>
 <% } %>
+