[Rt-commit] rt branch, 3.8-trunk, updated. rt-3.8.7-146-g650e1c8

[Kevin Falcone]

The branch, 3.8-trunk has been updated
       via  650e1c8622c053975612b827f18faa643f0c694a (commit)
       via  d0765fa0d59080e98bcb0eb2e33588ab137e7edd (commit)
       via  8b04ea78fbd34803a820a9edd4743e3592872b7e (commit)
       via  377a769dd6e71b1dd274413d276733a5ff54b189 (commit)
       via  79746a8046b1c04bbe2fd9adf73356fd3aec3de1 (commit)
      from  a0789f618c2fb66e0403707bfc7ff905ff74ae52 (commit)

Summary of changes:
 lib/RT/Interface/Web/Request.pm           |    2 +-
 share/html/Admin/Tools/Configuration.html |    7 +++++++
 share/html/Dashboards/Render.html         |    2 +-
 share/html/Elements/Login                 |    3 ++-
 t/web/dashboards.t                        |    8 ++++----
 5 files changed, 15 insertions(+), 7 deletions(-)

- Log -----------------------------------------------------------------
commit 79746a8046b1c04bbe2fd9adf73356fd3aec3de1
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Fri Feb 5 11:17:32 2010 -0500

    Dashboards changed from 20 to 50 to match the system default in
    b89e52f2964a1ca2dbceb236b107afcbb4806ef7
    
    Update the tests to match

diff --git a/t/web/dashboards.t b/t/web/dashboards.t
index 9d98ce6..a816eb3 100644
--- a/t/web/dashboards.t
+++ b/t/web/dashboards.t
@@ -133,14 +133,14 @@ $ticket->Create(
 );
 
 $m->follow_link_ok({text => 'different dashboard'});
-$m->content_contains("20 highest priority tickets I own");
-$m->content_contains("20 newest unowned tickets");
+$m->content_contains("50 highest priority tickets I own");
+$m->content_contains("50 newest unowned tickets");
 $m->content_lacks("Bookmarked Tickets");
 $m->content_contains("dashboard test", "ticket subject");
 
 $m->get_ok("/Dashboards/$id/This fragment left intentionally blank");
-$m->content_contains("20 highest priority tickets I own");
-$m->content_contains("20 newest unowned tickets");
+$m->content_contains("50 highest priority tickets I own");
+$m->content_contains("50 newest unowned tickets");
 $m->content_lacks("Bookmarked Tickets");
 $m->content_contains("dashboard test", "ticket subject");
 

commit 377a769dd6e71b1dd274413d276733a5ff54b189
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Fri Feb 5 11:23:42 2010 -0500

    Use a define() check rather than != 0
    
    We need to detect if the user had a subscription preference,
    but the other check threw lots of warnings

diff --git a/share/html/Dashboards/Render.html b/share/html/Dashboards/Render.html
index 1ae9507..ba01a9d 100644
--- a/share/html/Dashboards/Render.html
+++ b/share/html/Dashboards/Render.html
@@ -112,7 +112,7 @@ for my $sub ($session{'CurrentUser'}->UserObj->Attributes->Named('Subscription')
 
 # otherwise honor their search preferences.. otherwise 50 rows
 # $rows == 0 means unlimited, which we don't want to ignore from above
-if (!$rows and ($rows != 0)) {
+unless (defined($rows)) {
     my $prefs = $session{'CurrentUser'}->UserObj->Preferences("SearchDisplay") || {};
     $rows = defined($prefs->{'RowsPerPage'}) ? $prefs->{'RowsPerPage'} : 50;
 }

commit 8b04ea78fbd34803a820a9edd4743e3592872b7e
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Fri Feb 5 11:37:49 2010 -0500

    fix warning when authority is undef

diff --git a/share/html/Elements/Login b/share/html/Elements/Login
index f449e62..e768b0e 100755
--- a/share/html/Elements/Login
+++ b/share/html/Elements/Login
@@ -74,8 +74,9 @@ unless (!defined($uri->scheme) || $uri->scheme eq 'http' || $uri->scheme eq 'htt
 }
 
 # Make sure we're logging in to the same domain
+# You can get an undef authority with a relative uri like "index.html"
 my $uri_base_url = URI->new(RT->Config->Get('WebBaseURL'));
-unless ($uri->authority eq $uri_base_url->authority) {
+unless (!defined($uri->authority) || $uri->authority eq $uri_base_url->authority) {
     $form_action = RT->Config->Get('WebPath');
 }
 </%INIT>

commit d0765fa0d59080e98bcb0eb2e33588ab137e7edd
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Fri Feb 5 08:56:51 2010 -0500

    Show the dynamically calculated mason local component root
    
    Now that the mason component roots are modified at runtime by Plugins,
    show the order to admins in case they're having trouble tracking down
    the load order.

diff --git a/share/html/Admin/Tools/Configuration.html b/share/html/Admin/Tools/Configuration.html
index eb48af1..93b60a9 100644
--- a/share/html/Admin/Tools/Configuration.html
+++ b/share/html/Admin/Tools/Configuration.html
@@ -128,6 +128,13 @@ foreach my $key ( RT->Config->Options( Overridable => undef, Sorted => 0 ) ) {
 % }
 </table>
 
+<h3><&|/l&>Plugin Mason Component Path Order</&></h3>
+<table>
+% foreach my $path ( map { $_->[1] } $m->interp->comp_root_array ) {
+<tr><td><% $path %></td></tr>
+% }
+</table>
+
 <h2><&|/l&>RT Size</&></h2>
 <table>
 <%PERL>

commit 650e1c8622c053975612b827f18faa643f0c694a
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Fri Feb 5 08:55:07 2010 -0500

    Stop sorting Callbacks directories
    
    Originally this was added because all callbacks lived in
    local/html/Callbacks and we needed to impose some order other than "how
    readdir returned a list of directories".
    
    Now with plugins, each Callbacks directory lives in
    local/plugins/RT-Extension-Foo/html/Callbacks and we have a user defined
    sort order (the order of the @Plugins config option) which we should use
    instead.

diff --git a/lib/RT/Interface/Web/Request.pm b/lib/RT/Interface/Web/Request.pm
index e179464..573c69a 100644
--- a/lib/RT/Interface/Web/Request.pm
+++ b/lib/RT/Interface/Web/Request.pm
@@ -160,7 +160,7 @@ sub callback {
 
         my %seen;
         @$callbacks = (
-            sort grep defined && length,
+            grep defined && length,
             # Skip backup files, files without a leading package name,
             # and files we've already seen
             grep !$seen{$_}++ && !m{/\.} && !m{~$} && m{^/Callbacks/[^/]+\Q$page/$name\E$},

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