fix statistics report TitleBox, #13546

diff --git a/rt/share/html/Elements/TitleBox b/rt/share/html/Elements/TitleBox
index 1efb45a..3082b5b 100644 (file)
--- a/rt/share/html/Elements/TitleBox
+++ b/rt/share/html/Elements/TitleBox
@@ -45,7 +45,8 @@
 %# those contributions and any derivatives thereof.
 %# 
 %# END BPS TAGGED BLOCK }}}
+<&| /Widgets/TitleBox, %ARGS &><% $m->content |n%></&>
 <%init>
 # For compatibility with 3.4
-$m->comp('/Widgets/TitleBox', %ARGS );
+# $m->comp('/Widgets/TitleBox', %ARGS ); Doesn't actually work
 </%init>

diff --git a/rt/share/html/RTx/Statistics/CallsMultiQueue/index.html b/rt/share/html/RTx/Statistics/CallsMultiQueue/index.html
index 1b7a659..512d62d 100755 (executable)
--- a/rt/share/html/RTx/Statistics/CallsMultiQueue/index.html
+++ b/rt/share/html/RTx/Statistics/CallsMultiQueue/index.html
@@ -21,7 +21,7 @@ The line chart below shows the same information in a graphical form.
 %        Statistics::FormatDate($Statistics::PerDayDateFormat, $dates[0]) . " through " .
 %        Statistics::FormatDate($Statistics::PerDayDateFormat, $dates[$#dates-1]);
 
-<& /Elements/TitleBoxStart, title => $title, title_href => "/RTx/Statistics/OpenStalled/index.html?$QueryString"&>
+<& /Elements/TitleBoxStart, title => $title, title_href => $RT::WebPath."/RTx/Statistics/OpenStalled/index.html?$QueryString"&>
 <TABLE BORDER=0 cellspacing=0 cellpadding=1 WIDTH="100%">
 % if ($ShowHeader) {
 <& /RTx/Statistics/Elements/CollectionAsTable/Header, 

diff --git a/rt/share/html/RTx/Statistics/CallsQueueDay/index.html b/rt/share/html/RTx/Statistics/CallsQueueDay/index.html
index 5a4fe52..701a9ab 100755 (executable)
--- a/rt/share/html/RTx/Statistics/CallsQueueDay/index.html
+++ b/rt/share/html/RTx/Statistics/CallsQueueDay/index.html
@@ -16,7 +16,7 @@ for a spreadsheet, use this <a href="<%$RT::WebPath%>/RTx/Statistics/CallsQueueD
 %        Statistics::FormatDate($Statistics::PerDayDateFormat, $dates[$#dates-1]);
 <&|/Elements/TitleBox, 
        title => $title,
-       title_href => "/RTx/Statistics/CallsQueueDay/index.html?$QueryString" &>
+       title_href => $RT::WebPath."/RTx/Statistics/CallsQueueDay/index.html?$QueryString" &>
 <TABLE BORDER=0 cellspacing=0 cellpadding=1 WIDTH=100%>
 % if ($ShowHeader) {
 <& /RTx/Statistics/Elements/CollectionAsTable/Header, 

diff --git a/rt/share/html/RTx/Statistics/DayOfWeek/index.html b/rt/share/html/RTx/Statistics/DayOfWeek/index.html
index 6353abb..6003850 100755 (executable)
--- a/rt/share/html/RTx/Statistics/DayOfWeek/index.html
+++ b/rt/share/html/RTx/Statistics/DayOfWeek/index.html
@@ -12,7 +12,7 @@ selected queue for each day. It also hows how many of those created tickets were
 %my $title = "Ticket counts by day of week in " . $QueueObj->Name();
 <&|/Elements/TitleBox, 
        title => $title,
-       title_href => "/RTx/Statistics/DayOfWeek/index.html?$QueryString" &>
+       title_href => $RT::WebPath."/RTx/Statistics/DayOfWeek/index.html?$QueryString" &>
 <TABLE BORDER=0 cellspacing=0 cellpadding=1 WIDTH=100%>
 % if ($ShowHeader) {
 <& /RTx/Statistics/Elements/CollectionAsTable/Header, 

diff --git a/rt/share/html/RTx/Statistics/OpenStalled/index.html b/rt/share/html/RTx/Statistics/OpenStalled/index.html
index 4a1badb..31ef646 100755 (executable)
--- a/rt/share/html/RTx/Statistics/OpenStalled/index.html
+++ b/rt/share/html/RTx/Statistics/OpenStalled/index.html
@@ -15,7 +15,7 @@ viewed once (Open) and how many have had their status changed to stalled.</p>
 
 
 %my $title = "New, Open and Stalled Tickets in " . join(', ', @queues);
-<& /Elements/TitleBoxStart, title => $title, title_href => "/RTx/Statistics/OpenStalled/index.html?$QueryString"&>
+<& /Elements/TitleBoxStart, title => $title, title_href => $RT::WebPath."/RTx/Statistics/OpenStalled/index.html?$QueryString"&>
 <TABLE BORDER=0 cellspacing=0 cellpadding=1 WIDTH="100%">
 % if ($ShowHeader) {
 <& /RTx/Statistics/Elements/CollectionAsTable/Header, 

diff --git a/rt/share/html/RTx/Statistics/Resolution/index.html b/rt/share/html/RTx/Statistics/Resolution/index.html
index 838d273..3f96919 100644 (file)
--- a/rt/share/html/RTx/Statistics/Resolution/index.html
+++ b/rt/share/html/RTx/Statistics/Resolution/index.html
@@ -15,7 +15,7 @@ resolve.</p>
 %        Statistics::FormatDate($Statistics::PerDayDateFormat, $dates[$#dates-1]);
 <&|/Elements/TitleBox, 
        title => $title,
-       title_href => "/RTx/Statistics/Resolution/index.html?$QueryString" &>
+       title_href => $RT::WebPath ."/RTx/Statistics/Resolution/index.html?$QueryString" &>
 <TABLE BORDER=0 cellspacing=0 cellpadding=1 WIDTH=100%>
 % if ($ShowHeader) {
 <& /RTx/Statistics/Elements/CollectionAsTable/Header, 
@@ -106,6 +106,8 @@ for(0..$diff-1) {
 
 </form>
 
+<% Statistics::DebugInit($m) |n %>
+
 <%ARGS>
 $max => $Statistics::TimeToResolveMaxRows
 $Queue => undef
@@ -247,7 +249,7 @@ $QueueObj->Load($Queue);
 # the arrays, so that they end up in start to finish order.
 $eEpoch += $Statistics::secsPerDay;
 $n = 0;
-until ($#dates == $diff ) {    
+until ($#dates == $diff ) {
     my $date = new RT::Date($session{CurrentUser});
     $date->Set(Value=>$endRange - $n, Format => 'unix');
     # Note: we used to adjust the time to local midnight, but