diff options
| author | Jonathan Prykop <jonathan@freeside.biz> | 2015-02-12 13:30:03 -0600 |
|---|---|---|
| committer | Jonathan Prykop <jonathan@freeside.biz> | 2015-02-12 13:30:03 -0600 |
| commit | 9954eac1ec11d4bf1d6e7925895ce675fcdc6e22 (patch) | |
| tree | 5d37c627aee36d0bd2c708abfe1463a24cc1ae81 /httemplate | |
| parent | 6e3c1b8915c39e82a9a1ac48acc5b0c360daadb7 (diff) | |
| parent | 342e1472c53f4718b6600fe52be3068f2caba61a (diff) | |
Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE_3_BRANCH
Diffstat (limited to 'httemplate')
| -rw-r--r-- | httemplate/edit/process/elements/process.html | 6 | ||||
| -rw-r--r-- | httemplate/elements/tr-select-inventory_item.html | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/httemplate/edit/process/elements/process.html b/httemplate/edit/process/elements/process.html index 698540b79..5b79c21bb 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; @@ -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), ); } diff --git a/httemplate/elements/tr-select-inventory_item.html b/httemplate/elements/tr-select-inventory_item.html index 669e85f27..d7a14ec95 100644 --- a/httemplate/elements/tr-select-inventory_item.html +++ b/httemplate/elements/tr-select-inventory_item.html @@ -12,7 +12,6 @@ <& tr-td-label.html, %opt &> <TD> <& select-tiered.html, - 'prefix' => $opt{'field'}.'_', 'tiers' => [ { field => $opt{'field'}.'_classnum', @@ -32,12 +31,15 @@ }, ], %opt, + 'prefix' => $opt{'prefix'}. $opt{'field'}. '_', #after %opt so it overrides &> </TD> </TR> % } <%init> + my %opt = @_; + my @classnums; if (ref($opt{'classnum'})) { @classnums = @{ $opt{'classnum'} }; @@ -45,4 +47,5 @@ if (ref($opt{'classnum'})) { @classnums = split(',', $opt{'classnum'}); } my $classnum_sql = 'classnum IN('.join(',', @classnums).')'; + </%init> |