projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
invoice batch download fix, #11871
[freeside.git]
/
httemplate
/
elements
/
progress-popup.html
diff --git
a/httemplate/elements/progress-popup.html
b/httemplate/elements/progress-popup.html
index
a292102
..
42e4641
100644
(file)
--- 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 $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 $formname = scalar($cgi->param('formname'));
%
@@
-64,11
+65,12
@@
function updateStatus( status_statustext ) {
% } elsif ( $url ) {
window.top.location.href = '<% $url %>';
% } elsif ( $url ) {
window.top.location.href = '<% $url %>';
+% } elsif ( $popup_url ) {
+ document.parentWindow.location.replace('<% $popup_url %>');
% } else {
alert('job done but no url or message specified');
% }
% } else {
alert('job done but no url or message specified');
% }
-
} else if ( status.indexOf('done') > -1 ) {
document.getElementById("progress_message").innerHTML = "Loading report";
} else if ( status.indexOf('done') > -1 ) {
document.getElementById("progress_message").innerHTML = "Loading report";