X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fprogress-popup.html;h=2d273880c642f60547c4310ef4e9523b98c1eb80;hb=b431ece7b4a71aa5771f44393da582692f668817;hp=8a55efb4a52f30fd7b78881bf674ba7e226cf3c9;hpb=8f548b7139b1bd093c2e23eafcd1e29e64f8e8b7;p=freeside.git

diff --git a/httemplate/elements/progress-popup.html b/httemplate/elements/progress-popup.html
index 8a55efb4a..2d273880c 100644
--- a/httemplate/elements/progress-popup.html
+++ b/httemplate/elements/progress-popup.html
@@ -2,6 +2,7 @@
 %  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'));
 %
 
@@ -62,12 +63,22 @@ function updateStatus( status_statustext ) {
 %   }
 
 % } 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 ) {
     document.getElementById("progress_message").innerHTML = '<FONT SIZE="+1" COLOR="#FF0000">Error: ' + statustext + '</FONT>';