X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fprogress-popup.html;h=2d273880c642f60547c4310ef4e9523b98c1eb80;hb=ea3ce8d7f076e7fecff4be7ae63bc413adb0adf5;hp=a2921020178ce81bada9e24659c869afa3a6110d;hpb=1702ffad58949ebe9e4769afeb9fe9c93249cf69;p=freeside.git diff --git a/httemplate/elements/progress-popup.html b/httemplate/elements/progress-popup.html index a29210201..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,13 +63,15 @@ 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";