X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fprogress-popup.html;fp=httemplate%2Felements%2Fprogress-popup.html;h=20bb5fc5a9c25a9de05f4c3f4408392ebc471cf8;hb=684a478c0f88e5bf6d1d3f32f4618089146b5709;hp=d180c17d40900f92ae29df92872aa95f0cd4fce4;hpb=14cc10e34e277f4761be76d67d621b5a5d10a87f;p=freeside.git
diff --git a/httemplate/elements/progress-popup.html b/httemplate/elements/progress-popup.html
index d180c17d4..20bb5fc5a 100644
--- a/httemplate/elements/progress-popup.html
+++ b/httemplate/elements/progress-popup.html
@@ -1,6 +1,7 @@
<%
my $jobnum = $cgi->param('jobnum');
my $url = $cgi->param('url');
+ my $message = $cgi->param('message');
my $formname = scalar($cgi->param('formname'));
%>
@@ -29,7 +30,17 @@ function updateStatus( status_statustext ) {
bar1.update;
jsrsExecute( '<%=$p%>elements/jsrsServer.html', updateStatus, 'job_status', '<%= $jobnum %>' );
} else if ( status.indexOf('complete') > -1 ) {
+<% if ( $message ) { %>
+ document.getElementById("progress_message").innerHTML = "<%= $message %>";
+ document.getElementById("progress_bar").innerHTML = '';
+ document.getElementById("progress_percent").innerHTML = '';
+ document.getElementById("progress_jobnum").innerHTML = '';
+ parent.document.<%=$formname%>.submit.disabled=false;
+<% } elsif ( $url ) { %>
window.top.location.href = '<%= $url %>';
+<% } else { %>
+ alert('job done but no url or message specified');
+<% } %>
} else if ( status.indexOf('error') > -1 ) {
document.getElementById("progress_message").innerHTML = 'Error: ' + statustext + '';
document.getElementById("progress_bar").innerHTML = '';