X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fprogress-popup.html;h=a37cf24ebecc857b054f35bd97a65bf0858a4321;hb=ac20214d38d9af00430423f147b5a0e50751b050;hp=8a55efb4a52f30fd7b78881bf674ba7e226cf3c9;hpb=624b2d44625f69d71175c3348cae635d580c890b;p=freeside.git
diff --git a/httemplate/elements/progress-popup.html b/httemplate/elements/progress-popup.html
index 8a55efb4a..a37cf24eb 100644
--- a/httemplate/elements/progress-popup.html
+++ b/httemplate/elements/progress-popup.html
@@ -2,7 +2,9 @@
% my $jobnum = $cgi->param('jobnum');
% my $url = $cgi->param('url');
% my $message = $cgi->param('message');
+% my $popup_url = $cgi->param('popup_url');
% my $formname = scalar($cgi->param('formname'));
+% my $error_url = $cgi->param('error_url');
%
@@ -61,18 +63,35 @@ function updateStatus( status_statustext ) {
}
% }
-% } elsif ( $url ) {
-
+% } elsif ( $url ) {
+ parent.nd(1);
window.top.location.href = '<% $url %>';
+% } elsif ( $popup_url ) {
+ document.location.replace('<% $popup_url %>');
% } else {
+
alert('job done but no url or message specified');
% }
+ } else if ( status.indexOf('done') > -1 ) {
+
+ document.getElementById("progress_message").innerHTML = "Loading report";
+ document.getElementById("progress_bar").innerHTML = '';
+ document.getElementById("progress_percent").innerHTML = '';
+ document.getElementById("progress_jobnum").innerHTML = '';
+ window.top.location.href = statustext.substr(8, statustext.length-18);
} else if ( status.indexOf('error') > -1 ) {
+%
+% # default behavior: just close the popup
+% my $onClick = 'parent.nd(1);';
+% if ( $error_url ) { # then on clicking to confirm, redirect somewhere
+% $onClick = "window.top.location.href = \\'$error_url\\';";
+% }
+
document.getElementById("progress_message").innerHTML = 'Error: ' + statustext + '';
document.getElementById("progress_bar").innerHTML = '';
- document.getElementById("progress_percent").innerHTML = '';
+ document.getElementById("progress_percent").innerHTML = '';
document.getElementById("progress_jobnum").innerHTML = '';
if ( parent.document.<%$formname%>.submit.disabled == true ) {
parent.document.<%$formname%>.submit.disabled=false;