projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.freeside.biz:/home/git/freeside
[freeside.git]
/
httemplate
/
browse
/
did_order.html
diff --git
a/httemplate/browse/did_order.html
b/httemplate/browse/did_order.html
index
61b37d8
..
f328c1f
100644
(file)
--- a/
httemplate/browse/did_order.html
+++ b/
httemplate/browse/did_order.html
@@
-149,9
+149,10
@@
my @merge_targets = qsearch({
my $merge_select = sub {
my $source_ordernum = shift;
my $merge_select = '';
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>";
$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>";
}
next if $order->ordernum == $source_ordernum;
$merge_select .= "<OPTION>".$order->ordernum."</OPTION>";
}