X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fprogress-popup.html;fp=httemplate%2Felements%2Fprogress-popup.html;h=0bd71ff4a07e5e17239be71acc4b3fa2182cb37b;hb=5da73ac30a52234cc126ead03cddaf5a4e131019;hp=cda704a12c7e3e5977d52a6b28beccb6195fa67b;hpb=5d4d60dd8cbe71a96256b6c375f01e0182296f18;p=freeside.git
diff --git a/httemplate/elements/progress-popup.html b/httemplate/elements/progress-popup.html
index cda704a12..0bd71ff4a 100644
--- a/httemplate/elements/progress-popup.html
+++ b/httemplate/elements/progress-popup.html
@@ -41,15 +41,24 @@ function updateStatus( status_statustext ) {
//jsrsExecute( '<%$p%>elements/jsrsServer.html', updateStatus, 'job_status', '<% $jobnum %>' );
job_status( '<% $jobnum %>', updateStatus );
} else if ( status.indexOf('complete') > -1 ) {
-% if ( $message ) {
+% if ( $message ) {
+%
+% my $onClick = $url
+% ? "window.top.location.href = \\'$url\\';"
+% : 'parent.nd(1);';
document.getElementById("progress_message").innerHTML = "<% $message %>";
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;
- }
+
+% unless ( $url ) {
+ if ( parent.document.<%$formname%>.submit.disabled == true ) {
+ parent.document.<%$formname%>.submit.disabled=false;
+ }
+% }
+
% } elsif ( $url ) {
window.top.location.href = '<% $url %>';