diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2015-10-27 09:40:45 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2015-10-27 09:40:45 -0700 |
| commit | 0caa7ea9f8c1975f855ab167d1f8d0d3d1a3ddad (patch) | |
| tree | baf210d604fa8304131c1b04c27a6614e56f99ee | |
| parent | 434137989f7343ada30ceff4056c5f75ef8d9d27 (diff) | |
progressbar fix for elements/ exclusion, RT#38752
| -rw-r--r-- | FS/FS/CGI.pm | 6 | ||||
| -rw-r--r-- | httemplate/elements/progress-init.html | 2 | ||||
| -rw-r--r-- | httemplate/misc/jsrsServer.html (renamed from httemplate/elements/jsrsServer.html) | 0 | ||||
| -rw-r--r-- | httemplate/misc/progress-popup.html (renamed from httemplate/elements/progress-popup.html) | 2 |
4 files changed, 3 insertions, 7 deletions
diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm index 5ac31db..fc0f652 100644 --- a/FS/FS/CGI.pm +++ b/FS/FS/CGI.pm @@ -244,17 +244,13 @@ sub rooturl { $url_string =~ s{ / - (browse|config|docs|edit|graph|misc|search|view|loginout|pref|elements|rt|torrus) + (browse|config|docs|edit|graph|misc|search|view|loginout|pref|rt|torrus) (/process)? ([\w\-\.\/]*) $ } {}x; - #elements because of progress-popup.html... - #XXX remove anything from elements that is called directly & prevent - #those pages from being served up - $url_string .= '/' unless $url_string =~ /\/$/; $url_string; diff --git a/httemplate/elements/progress-init.html b/httemplate/elements/progress-init.html index 2728240..e38dde6 100644 --- a/httemplate/elements/progress-init.html +++ b/httemplate/elements/progress-init.html @@ -161,7 +161,7 @@ if ( ref($url_or_message) ) { #its a message or something %dest_info = ( 'url' => $url_or_message ); } -my $progress_url = URI->new($fsurl.'elements/progress-popup.html'); +my $progress_url = URI->new($fsurl.'misc/progress-popup.html'); $progress_url->query_form( 'jobnum' => '_JOBNUM_', 'formname' => $formname, diff --git a/httemplate/elements/jsrsServer.html b/httemplate/misc/jsrsServer.html index f37b0aa..f37b0aa 100644 --- a/httemplate/elements/jsrsServer.html +++ b/httemplate/misc/jsrsServer.html diff --git a/httemplate/elements/progress-popup.html b/httemplate/misc/progress-popup.html index a37cf24..8e2d676 100644 --- a/httemplate/elements/progress-popup.html +++ b/httemplate/misc/progress-popup.html @@ -14,7 +14,7 @@ <BODY BGCOLOR="#ccccff" onLoad="refreshStatus()"> <% include('/elements/xmlhttp.html', - 'url' => $p.'elements/jsrsServer.html', + 'url' => $p.'misc/jsrsServer.html', 'subs' => [ 'job_status' ], ) %> |