diff options
| author | Christopher Burger <burgerc@freeside.biz> | 2019-04-28 19:14:49 -0400 |
|---|---|---|
| committer | Christopher Burger <burgerc@freeside.biz> | 2019-04-30 14:07:35 -0400 |
| commit | 1c3b548f575b3313d9a93b391751f6ce719b0b6d (patch) | |
| tree | b0b6a4656c3ab227dee5bdba3b1505e00571bd3c /httemplate/edit | |
| parent | 27ef6158f7cca5785626e1a71b3be794e277c045 (diff) | |
RT# 83204 - added link to service or tower causing error.
Diffstat (limited to 'httemplate/edit')
| -rw-r--r-- | httemplate/edit/part_export.cgi | 9 | ||||
| -rw-r--r-- | httemplate/edit/process/elements/process.html | 6 |
2 files changed, 13 insertions, 2 deletions
diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi index f6ec208be..f8a46c7fd 100644 --- a/httemplate/edit/part_export.cgi +++ b/httemplate/edit/part_export.cgi @@ -63,6 +63,8 @@ if ( $cgi->param('error') ) { $part_export = new FS::part_export ( { map { $_, scalar($cgi->param($_)) } fields('part_export') } ); +} elsif ( $cgi->param('exportnum') ) { + $part_export = qsearchs('part_export', { 'exportnum' => $cgi->param('exportnum') } ); } elsif ( $query =~ /^(\d+)$/ ) { $part_export = qsearchs('part_export', { 'exportnum' => $1 } ); } else { @@ -296,7 +298,12 @@ my $widget = new HTML::Widgets::SelectLayers( $part_export->exporttype, [ $script.'_exportnum', $script.'_script' ], rooturl().'view/svc_export/run_script.cgi', - rooturl().'edit/part_export.cgi?'.$part_export->{Hash}->{exportnum}, + { + 'error_url' => rooturl().$exports->{$layer}{scripts}{$script}->{error_url}."exportnum=".$part_export->{Hash}->{exportnum}, + 'reload_with_error' => '1', + 'url' => rooturl().'edit/part_export.cgi?'.$part_export->{Hash}->{exportnum}, + 'message' => $exports->{$layer}{scripts}{$script}->{success_message}, + }, $script, ) . '<INPUT TYPE="hidden" NAME="'.$script.'_exportnum" VALUE="'.$part_export->{Hash}->{exportnum}.'"> diff --git a/httemplate/edit/process/elements/process.html b/httemplate/edit/process/elements/process.html index f70875bec..e332957eb 100644 --- a/httemplate/edit/process/elements/process.html +++ b/httemplate/edit/process/elements/process.html @@ -499,7 +499,11 @@ if ($class eq "FS::tower" && !$error) { $error = $export_tower->{'error'} if $export_tower; } } - $cgi->param('error', $error) if $error; + if ($error) { + my $encoded_error = encode_base64($error); + $cgi->param('error_link', $encoded_error) if $error; + + } } # set up redirect URLs |