[freeside-commits] branch FREESIDE_4_BRANCH updated. 937575b5e5e515192df036d25270ced126eedcd6

[Ivan]

The branch, FREESIDE_4_BRANCH has been updated
       via  937575b5e5e515192df036d25270ced126eedcd6 (commit)
      from  78c9cc248531d5333306170ea1326fc0a9a269a3 (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 937575b5e5e515192df036d25270ced126eedcd6
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Fri Jul 10 01:28:02 2015 -0700

    fix RT 4.2.11 javascript inclusion, at least for RichText / ckeditor, RT#13852

diff --git a/htetc/freeside-rt.conf b/htetc/freeside-rt.conf
index bcc5de3..fe0142e 100644
--- a/htetc/freeside-rt.conf
+++ b/htetc/freeside-rt.conf
@@ -90,3 +90,13 @@ SetHandler perl-script
 PerlHandler HTML::Mason 
 </Directory>
 
+#XXX support running without /freeside in 4.x?  or are we just giving up on
+# that and putting a redirect in at / ?
+Alias /freeside/rt/static "/opt/rt3/share/static"
+<Directory "/opt/rt3/share/static">
+<Limit GET POST>
+allow from all
+Satisfy any
+</Limit>
+</Directory>
+
diff --git a/rt/share/html/Elements/Header b/rt/share/html/Elements/Header
index 3aeb319..3a5be7a 100755
--- a/rt/share/html/Elements/Header
+++ b/rt/share/html/Elements/Header
@@ -101,7 +101,7 @@ my $WebImagesURL = RT->Config->Get('WebImagesURL');
 my $squished = RT->Config->Get('DevelMode') ? '' : '-squished';
 
 if ( $JavaScript ) {
-  $head .= $m->scomp('JavascriptConfig');
+  $head .= $m->scomp('/Elements/JavascriptConfig');
 }
 
 for my $cssfile ( @css_files ) {
@@ -118,7 +118,7 @@ if ( $RSSAutoDiscovery ) {
 }
 
 if ($JavaScript) {
-    $head .= $m->scomp('HeaderJavascript', focus => $Focus, onload => $onload, RichText => $RichText );
+    $head .= $m->scomp('/Elements/HeaderJavascript', focus => $Focus, onload => $onload, RichText => $RichText );
 
     my $stylesheet_plugin = "/NoAuth/css/$style/InHeader";
     if ($m->comp_exists($stylesheet_plugin) ) {
@@ -135,7 +135,6 @@ my $etc = ' class="'. join( '',@{$ARGS{'BodyClass'}}). '" ';
 $etc .= qq[ id="comp-$id"] if $id;
 
 </%INIT>
-
 <%ARGS>
 #$Focus => 'focus'
 $Focus => ''

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

Summary of changes:
 htetc/freeside-rt.conf        |   10 ++++++++++
 rt/share/html/Elements/Header |    5 ++---
 2 files changed, 12 insertions(+), 3 deletions(-)