[freeside-commits] freeside/httemplate/browse did_order.html, 1.6, 1.6.2.1

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/browse
In directory wavetail.420.am:/tmp/cvs-serv31204

Modified Files:
      Tag: FREESIDE_2_3_BRANCH
	did_order.html 
Log Message:
don't show an empty merge dropdown when there's only one order

Index: did_order.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/browse/did_order.html,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -w -d -r1.6 -r1.6.2.1
--- did_order.html	8 Jun 2011 05:37:39 -0000	1.6
+++ did_order.html	12 Aug 2011 20:07:55 -0000	1.6.2.1
@@ -149,9 +149,10 @@
 my $merge_select = sub {
     my $source_ordernum = shift;
     my $merge_select = '';
-    if ( @merge_targets ) {
+    my @targets = grep { $_->ordernum != $source_ordernum } @merge_targets;
+    if ( @targets ) {
         $merge_select = "<SELECT onchange='mergeconfirm(this,$source_ordernum)'><OPTION></OPTION>";
-        foreach my $order ( @merge_targets ) {
+        foreach my $order ( @targets ) {
             next if $order->ordernum == $source_ordernum;
             $merge_select .= "<OPTION>".$order->ordernum."</OPTION>";
         }