[Jifty-commit] r4633 - in jifty/trunk: lib/Jifty/Plugin lib/Jifty/Plugin/Queries

[jifty-commit at lists.jifty.org]

Author: sartak
Date: Thu Dec  6 19:35:59 2007
New Revision: 4633

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/lib/Jifty/Plugin/Queries.pm
   jifty/trunk/lib/Jifty/Plugin/Queries/Dispatcher.pm
   jifty/trunk/lib/Jifty/Plugin/Queries/View.pm

Log:
 r48740 at onn:  sartak | 2007-12-06 19:35:45 -0500
 Move the query reports into /__jifty/admin/


Modified: jifty/trunk/lib/Jifty/Plugin/Queries.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin/Queries.pm	(original)
+++ jifty/trunk/lib/Jifty/Plugin/Queries.pm	Thu Dec  6 19:35:59 2007
@@ -26,16 +26,16 @@
 
 View the top-level query report (how many queries each request had)
 
-    http://your.app/queries
+    http://your.app/__jifty/admin/queries
 
 View the top-level query report, including zero-query requests
 
-    http://your.app/queries/all
+    http://your.app/__jifty/admin/queries/all
 
 View an individual request's detailed query report (which queries were made,
 where, how long they took, etc)
 
-    http://your.app/queries/3
+    http://your.app/__jifty/admin/queries/3
 
 =head2 init
 

Modified: jifty/trunk/lib/Jifty/Plugin/Queries/Dispatcher.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin/Queries/Dispatcher.pm	(original)
+++ jifty/trunk/lib/Jifty/Plugin/Queries/Dispatcher.pm	Thu Dec  6 19:35:59 2007
@@ -5,31 +5,31 @@
 use Jifty::Dispatcher -base;
 
 # http://your.app/queries -- display full query report
-on '/queries' => run {
+on '/__jifty/admin/queries' => run {
     set 'skip_zero' => 1;
-    show "/queries/all";
+    show "/__jifty/admin/queries/all";
 };
 
 # http://your.app/queries/all -- full query report with non-query requests
-on '/queries/all' => run {
+on '/__jifty/admin/queries/all' => run {
     set 'skip_zero' => 0;
-    show "/queries/all";
+    show "/__jifty/admin/queries/all";
 };
 
 # http://your.app/queries/clear -- clear query log
-on '/queries/clear' => run {
+on '/__jifty/admin/queries/clear' => run {
     @Jifty::Plugin::Queries::requests = ();
     set 'skip_zero' => 1;
-    redirect "/queries";
+    redirect "/__jifty/admin/queries";
 };
 
 # http://your.app/queries/xxx -- display query report for request ID xxx
-on '/queries/#' => run {
+on '/__jifty/admin/queries/#' => run {
     abort(404) if $1 < 1;
     my $query = $Jifty::Plugin::Queries::requests[$1 - 1]
         or abort(404);
     set query => $query;
-    show "/queries/one";
+    show "/__jifty/admin/queries/one";
 };
 
 =head1 SEE ALSO

Modified: jifty/trunk/lib/Jifty/Plugin/Queries/View.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin/Queries/View.pm	(original)
+++ jifty/trunk/lib/Jifty/Plugin/Queries/View.pm	Thu Dec  6 19:35:59 2007
@@ -11,7 +11,9 @@
 
 =head1 TEMPLATES
 
-template '/queries/all' => sub {
+=cut
+
+template '/__jifty/admin/queries/all' => sub {
     my $skip_zero = get 'skip_zero';
 
     html {
@@ -19,14 +21,14 @@
             h1 { "Queries" }
             p {
                 if ($skip_zero) {
-                    a { attr { href => "/queries/all" }
+                    a { attr { href => "/__jifty/admin/queries/all" }
                         "Show zero-query requests" }
                 }
                 else {
-                    a { attr { href => "/queries" }
+                    a { attr { href => "/__jifty/admin/queries" }
                         "Hide zero-query requests" }
                 }
-                a { attr { href => "/queries/clear" }
+                a { attr { href => "/__jifty/admin/queries/clear" }
                     "Clear query log" }
             }
             hr {}
@@ -44,8 +46,9 @@
                     next if $skip_zero && @{ $_->{queries} } == 0;
 
                     row {
-                        cell { a { attr { href => "/queries/$_->{id}" }
-                                   $_->{id} } }
+                        cell { a {
+                            attr { href => "/__jifty/admin/queries/$_->{id}" }
+                            $_->{id} } }
 
                         cell { scalar @{ $_->{queries} } }
                         cell { $_->{duration} }
@@ -57,7 +60,7 @@
     }
 };
 
-template '/queries/one' => sub {
+template '/__jifty/admin/queries/one' => sub {
     my $query = get 'query';
 
     html {
@@ -69,7 +72,8 @@
                 li { "Time taken: $query->{duration}" }
                 li { "Queries made: " . @{ $query->{queries} } }
             }
-            p { a { attr { href => "/queries" } "Table of Contents" } };
+            p { a { attr { href => "/__jifty/admin/queries" }
+                    "Table of Contents" } };
 
             for ( @{ $query->{queries} } ) {
                 my ($time, $statement, $bindings, $duration, $misc) = @$_;