X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fedit%2Fprocess%2Felements%2Fprocess.html;h=1b9318725ae49c6e91b7313ddbbbab6c7b340e77;hp=1711b0118fcacedb4bf3a2fb17a87bb5f63c4583;hb=90e15da7354b55cc5461b58ac087096ed47e0240;hpb=a9056b16e215e7ac8da9144106e34918cced951f diff --git a/httemplate/edit/process/elements/process.html b/httemplate/edit/process/elements/process.html index 1711b0118..1b9318725 100644 --- a/httemplate/edit/process/elements/process.html +++ b/httemplate/edit/process/elements/process.html @@ -34,6 +34,11 @@ Example: 'clear_on_error' => [ 'form_field1', 'form_field2', ... ], + ## message will be returned to redirect page as cookie and read by header.html + ## append =status, =warning, =error to change color of message box. Default is status + ## status is green, warning is yellow, and error is red + 'message' => [ 'My message=status', 'Please restart=warning' ], + #pass an arrayref of hashrefs for multiple m2ms or m2names #be certain you incorporate m2m_Common if you see error: param @@ -208,7 +213,16 @@ process(); %} else { -<% $cgi->redirect($redirect) %> +% my $cookie; +% $cookie = CGI::Cookie->new( +% -name => 'freeside_status', +% -value => $messages, +% -expires => '+5m', +% ) if $messages; + <% $cgi->redirect( -uri => $redirect, + -cookie => $cookie, + ) + %> %} <%init> @@ -459,7 +473,13 @@ foreach my $value ( @values ) { if ( $error ) { - $cgi->param('error', $error); + if ($opt{'update_svc'}) { + my $encoded_error = encode_base64($error); + $cgi->param('error_link', $encoded_error); + } else { + $cgi->param('error', $error); + } + if ( $opt{'clear_on_error'} && scalar(@{$opt{'clear_on_error'}}) ) { foreach my $field (@{$opt{'clear_on_error'}}) { $cgi->param($field, '') @@ -478,14 +498,18 @@ foreach my $value ( @values ) { } -if ($class eq "FS::tower") { +if ($class eq "FS::tower" && !$error) { foreach my $part_svc_broadband_export ( FS::tower_sector->part_export_svc_broadband ) { if ($part_svc_broadband_export and $part_svc_broadband_export->can('export_tower_sector')) { my $export_tower = $part_svc_broadband_export->export_tower_sector($new); $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 @@ -510,6 +534,8 @@ if ( !$error ) { } } +my $messages = $opt{'message'} ? $opt{'message'} : ''; + my $edit_ext = $opt{'edit_ext'} || 'html'; my $error_redirect = $opt{'error_redirect'} || popurl(2)."$table.$edit_ext";