X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fprogress-init.html;h=a8268c12c10d3e4d8b60b1849846a3f5169cb170;hb=684a478c0f88e5bf6d1d3f32f4618089146b5709;hp=41feaac4b28e9ce13cbf77a92069e8a67e3c09fb;hpb=14cc10e34e277f4761be76d67d621b5a5d10a87f;p=freeside.git

diff --git a/httemplate/elements/progress-init.html b/httemplate/elements/progress-init.html
index 41feaac4b..a8268c12c 100644
--- a/httemplate/elements/progress-init.html
+++ b/httemplate/elements/progress-init.html
@@ -1,6 +1,14 @@
 <%
-  my( $formname, $fields, $action, $success_url, $key ) = @_;
+  my( $formname, $fields, $action, $url_or_message, $key ) = @_;
   $key = '' unless defined $key;
+
+  my $url_or_message_link;
+  if ( ref($url_or_message) ) { #its a message or something
+    $url_or_message_link =
+      'message='. uri_escape( $url_or_message->{'message'} )
+  } else {
+    $url_or_message_link = "url=$url_or_message";
+  }
 %>
 
 <SCRIPT TYPE="text/javascript" SRC="../elements/jsrsClient.js"></SCRIPT>
@@ -52,7 +60,7 @@ function <%=$key%>process () {
 
 function <%=$key%>myCallback( jobnum ) {
 
-  overlib( OLiframeContent('<%=$p%>elements/progress-popup.html?jobnum=' + jobnum + ';url=<%=$success_url%>;formname=<%=$formname%>' , 432, 136, 'progress_popup'), CAPTION, 'Please wait...', STICKY, AUTOSTATUSCAP, CLOSETEXT, '', CLOSECLICK, MIDX, 0, MIDY, 0 );
+  overlib( OLiframeContent('<%=$p%>elements/progress-popup.html?jobnum=' + jobnum + ';<%=$url_or_message_link%>;formname=<%=$formname%>' , 432, 136, 'progress_popup'), CAPTION, 'Please wait...', STICKY, AUTOSTATUSCAP, CLOSETEXT, '', CLOSECLICK, MIDX, 0, MIDY, 0 );
 
 }