X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fprocess%2Felements%2Fprocess.html;h=89a38f4f6e998bec828f7600d85e75a594d6877c;hb=0141b002ab937b2b3a21a92c3728bc3101f4668a;hp=698540b795ae821655148f4a1c302165baa30bab;hpb=f25c596ba479c7c5cebcfd4447bb0db9c70a1e06;p=freeside.git diff --git a/httemplate/edit/process/elements/process.html b/httemplate/edit/process/elements/process.html index 698540b79..89a38f4f6 100644 --- a/httemplate/edit/process/elements/process.html +++ b/httemplate/edit/process/elements/process.html @@ -62,6 +62,8 @@ Example: 'fields' => [qw( fieldname fieldname2 )], }, + 'process_locale' => 'fieldname', # update entries in the _msgcat table + 'process_upload' => { 'process' => 'misc/mytable-import.html', # fields to pass to the back end job, besides the @@ -157,7 +159,28 @@ process(); <& /elements/footer.html &> -%} elsif ( $opt{'popup_reload'} ) { +% } elsif ( $opt{'progress_init'} ) { +% # some false laziness with the above +% my ($form_name, $job_fields) = @{ $opt{'progress_init'} }; +
+ +% foreach my $field (@$job_fields) { +% next if $field eq $pkey; + +% } +<& /elements/progress-init.html, + @{ $opt{'progress_init'} } +&> + +
+ +<& /elements/footer.html &> + +% } elsif ( $opt{'popup_reload'} ) { <% include('/elements/header-popup.html', $opt{'popup_reload'} ) %> @@ -219,7 +242,7 @@ my %hash = my @values = ( 1 ); if ( $bfield ) { @values = $cgi->param($bfield); - warn join(',', @values); + #warn join(',', @values); } my @uploaded_files; @@ -308,7 +331,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 ); } } @@ -335,12 +358,21 @@ foreach my $value ( @values ) { } - if ( !$error && $opt{'process_o2m'} ) { - - my @process_o2m = ref($opt{'process_o2m'}) eq 'ARRAY' - ? @{ $opt{'process_o2m'} } - : ( $opt{'process_o2m'} ); + my @process_o2m; + if ( $opt{'process_o2m'} ) { + @process_o2m = ref($opt{'process_o2m'}) eq 'ARRAY' + ? @{ $opt{'process_o2m'} } + : ( $opt{'process_o2m'} ); + } + if ( $opt{'process_locale'} ) { + push @process_o2m, + { + 'table' => $table . '_msgcat', + 'fields' => [ 'locale', $opt{'process_locale'} ], + }; + } + if ( !$error ) { foreach my $process_o2m (@process_o2m) { @@ -350,7 +382,7 @@ foreach my $value ( @values ) { ); } - $error = $new->process_o2m( %{ $process_o2m }, + $error ||= $new->process_o2m( %{ $process_o2m }, 'params' => scalar($cgi->Vars), ); }