From e04a81044abea1d9bd0a53f96925c9a91e8e01e8 Mon Sep 17 00:00:00 2001 From: Mark Wells Date: Wed, 11 Feb 2015 22:59:54 -0800 Subject: properly handle errors from multiple process_o2m/m2m actions, #33490 --- httemplate/edit/process/elements/process.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'httemplate/edit/process/elements/process.html') diff --git a/httemplate/edit/process/elements/process.html b/httemplate/edit/process/elements/process.html index 698540b79..9d8fa79d2 100644 --- a/httemplate/edit/process/elements/process.html +++ b/httemplate/edit/process/elements/process.html @@ -308,7 +308,7 @@ foreach my $value ( @values ) { warn "$me processing m2m:\n". Dumper( %$process_m2m ) if $opt{'debug'}; - $error = $new->process_m2m( %$process_m2m ); + $error ||= $new->process_m2m( %$process_m2m ); } } @@ -350,7 +350,7 @@ foreach my $value ( @values ) { ); } - $error = $new->process_o2m( %{ $process_o2m }, + $error ||= $new->process_o2m( %{ $process_o2m }, 'params' => scalar($cgi->Vars), ); } -- cgit v1.2.1 From 420ce9160ae045218e464effcdcb678299cb5faa Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Thu, 12 Feb 2015 02:32:59 -0800 Subject: remove debug warning --- httemplate/edit/process/elements/process.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'httemplate/edit/process/elements/process.html') diff --git a/httemplate/edit/process/elements/process.html b/httemplate/edit/process/elements/process.html index 698540b79..ce40a7ea6 100644 --- a/httemplate/edit/process/elements/process.html +++ b/httemplate/edit/process/elements/process.html @@ -219,7 +219,7 @@ my %hash = my @values = ( 1 ); if ( $bfield ) { @values = $cgi->param($bfield); - warn join(',', @values); + #warn join(',', @values); } my @uploaded_files; -- cgit v1.2.1