projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
4.x style
[freeside.git]
/
httemplate
/
misc
/
progress-popup.html
diff --git
a/httemplate/misc/progress-popup.html
b/httemplate/misc/progress-popup.html
index
9964bcc
..
a0aa6f5
100644
(file)
--- a/
httemplate/misc/progress-popup.html
+++ b/
httemplate/misc/progress-popup.html
@@
-73,7
+73,13
@@
function updateStatus( status_statustext ) {
% # default behavior: just close the popup
% my $onClick = 'parent.nd(1);';
% if ( $error_url ) { # then on clicking to confirm, redirect somewhere
% # default behavior: just close the popup
% my $onClick = 'parent.nd(1);';
% if ( $error_url ) { # then on clicking to confirm, redirect somewhere
-% $onClick = "window.top.location.href = \\'$error_url\\';";
+% if ( $reload_with_error ) {
+ var encodedString = btoa(statustext);
+ parent.nd(1);
+ window.top.location.href = '<% $error_url."&error_link=" %>'+encodedString;
+% }
+%
+% $onClick = "window.top.location.href = \\'$error_url\\';";
% }
document.getElementById("progress_message").innerHTML = '<FONT SIZE="+1" COLOR="#FF0000">Error: ' + statustext + '</FONT>';
% }
document.getElementById("progress_message").innerHTML = '<FONT SIZE="+1" COLOR="#FF0000">Error: ' + statustext + '</FONT>';
@@
-126,5
+132,6
@@
my $message = $cgi->param('message');
my $popup_url = $cgi->param('popup_url');
my $formname = scalar($cgi->param('formname'));
my $error_url = $cgi->param('error_url');
my $popup_url = $cgi->param('popup_url');
my $formname = scalar($cgi->param('formname'));
my $error_url = $cgi->param('error_url');
+my $reload_with_error = $cgi->param('reload_with_error');
</%init>
</%init>