[freeside-commits] branch master updated. 23699764d0d8436b50f5cf88f798c552969714eb

Ivan ivan at 420.am
Fri Apr 4 17:30:43 PDT 2014


The branch, master has been updated
       via  23699764d0d8436b50f5cf88f798c552969714eb (commit)
       via  98652f79fc4fff916a46bc94d6301b24bcd13df3 (commit)
      from  0cce02317f73de9a0711c6d3523820b2d0d972f5 (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 23699764d0d8436b50f5cf88f798c552969714eb
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Fri Apr 4 17:30:42 2014 -0700

    fix db profling on pages that put javascript after </html>, like edit/part_event.html.  huh.  RT#27396

diff --git a/httemplate/autohandler b/httemplate/autohandler
index b5b1071..248f14a 100644
--- a/httemplate/autohandler
+++ b/httemplate/autohandler
@@ -41,7 +41,7 @@ if ( UNIVERSAL::can(dbh, 'sprintProfile') ) {
 
   dbh->{'private_profile'} = {};
 
-  s/(<\/BODY>[\s\n]*<\/HTML>[\s\n]*)$/$profile$1/i;
+  s/(<\/BODY>[\s\n]*<\/HTML>[\s\n]*)/$profile$1/i;
 }
 
 </%filter>

commit 98652f79fc4fff916a46bc94d6301b24bcd13df3
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Fri Apr 4 17:28:23 2014 -0700

    eliminate leading whitespace

diff --git a/httemplate/edit/elements/edit.html b/httemplate/edit/elements/edit.html
index 54d6768..f003454 100644
--- a/httemplate/edit/elements/edit.html
+++ b/httemplate/edit/elements/edit.html
@@ -196,7 +196,7 @@ Example:
   &>
 
 </%doc>
-
+%
 % unless ( $opt{embed} ) {
 %
 %   my $title = $opt{action}. ' '. ( $opt{name} || $opt{'name_singular'} );
@@ -213,14 +213,13 @@ Example:
 %       "View all $items" => $viewall_url,
 %     );
 %   }
-
-
-  <% include('/elements/header'. ( $opt{popup} ? '-popup' : '' ). '.html',
+%
+<% include('/elements/header'. ( $opt{popup} ? '-popup' : '' ). '.html',
                 $title,
                 include( '/elements/menubar.html', @menubar ),
                 $opt{'body_etc'},
              )
-  %>
+%>
 
   <% defined($opt{'html_init'}) 
         ? ( ref($opt{'html_init'})
diff --git a/httemplate/edit/part_event.html b/httemplate/edit/part_event.html
index 702471b..47b8c1a 100644
--- a/httemplate/edit/part_event.html
+++ b/httemplate/edit/part_event.html
@@ -1,4 +1,4 @@
-<% include( 'elements/edit.html',
+<& elements/edit.html,
               'name'   => 'Billing event definition',
               'table'  => 'part_event',
               'fields' => [
@@ -82,8 +82,7 @@
 
               'agent_virt'       => 1,
               'agent_null_right' => 'Edit global billing events',
-          )
-%>
+&>
 <SCRIPT TYPE="text/javascript">
 
   window.onload = function () { eventtable_changed(document.getElementById('eventtable')) };

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

Summary of changes:
 httemplate/autohandler             |    2 +-
 httemplate/edit/elements/edit.html |    9 ++++-----
 httemplate/edit/part_event.html    |    5 ++---
 3 files changed, 7 insertions(+), 9 deletions(-)




More information about the freeside-commits mailing list