[freeside-commits] branch master updated. 060c42eac1ecf2f376fe806c08a2ac78987cf9a6

Ivan ivan at 420.am
Tue Oct 27 09:41:06 PDT 2015


The branch, master has been updated
       via  060c42eac1ecf2f376fe806c08a2ac78987cf9a6 (commit)
       via  0caa7ea9f8c1975f855ab167d1f8d0d3d1a3ddad (commit)
      from  ce607e0cdf2e880cbc3cbcca335809c7de3a4657 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 060c42eac1ecf2f376fe806c08a2ac78987cf9a6
Merge: 0caa7ea ce607e0
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Oct 27 09:40:59 2015 -0700

    Merge branch 'master' of git.freeside.biz:/home/git/freeside


commit 0caa7ea9f8c1975f855ab167d1f8d0d3d1a3ddad
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Oct 27 09:40:45 2015 -0700

    progressbar fix for elements/ exclusion, RT#38752

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
similarity index 100%
rename from httemplate/elements/jsrsServer.html
rename to httemplate/misc/jsrsServer.html
diff --git a/httemplate/elements/progress-popup.html b/httemplate/misc/progress-popup.html
similarity index 98%
rename from httemplate/elements/progress-popup.html
rename to 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' ],
            )
 %>

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/CGI.pm                                      |    6 +-----
 httemplate/elements/progress-init.html            |    2 +-
 httemplate/{elements => misc}/jsrsServer.html     |    0
 httemplate/{elements => misc}/progress-popup.html |    2 +-
 4 files changed, 3 insertions(+), 7 deletions(-)
 rename httemplate/{elements => misc}/jsrsServer.html (100%)
 rename httemplate/{elements => misc}/progress-popup.html (98%)




More information about the freeside-commits mailing list