[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.9.6-221-g82b984c
Jesse Vincent
jesse at bestpractical.com
Mon Nov 29 19:56:31 EST 2010
The branch, 3.9-trunk has been updated
via 82b984c64ea21d21bcb1303e5c378b3a6d640647 (commit)
via 79901541f1e9e8599cf82b0caf99fa253f867b80 (commit)
via 66e9d395853d6c36634f7c9f0e801406294e8f28 (commit)
via 53c670656a9ef04cee82524f9eb73b3925922519 (commit)
from dd6e14cf1fc8630789a8f8e2278110209fd35915 (commit)
Summary of changes:
share/html/Elements/Tabs | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
- Log -----------------------------------------------------------------
commit 53c670656a9ef04cee82524f9eb73b3925922519
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Mon Nov 29 19:18:48 2010 -0500
qr'' to qr{} in Elements/Tabs
diff --git a/share/html/Elements/Tabs b/share/html/Elements/Tabs
index 5152d55..570f819 100755
--- a/share/html/Elements/Tabs
+++ b/share/html/Elements/Tabs
@@ -210,7 +210,7 @@ if ( $request_path !~ qr{^/SelfService/} ) {
|| RT->Config->Get('WebFallbackToInternalAuth') )) {
$about_me->child( logout => title => loc('Logout'), path => '/NoAuth/Logout.html' );
}
- if ( $request_path =~ qr'Dashboards/(\d+)?' ) {
+ if ( $request_path =~ qr{Dashboards/(\d+)?}) {
if ( my $id = ( $1 || $m->request_args->{'id'} ) ) {
my $obj = RT::Dashboard->new( $session{'CurrentUser'} );
$obj->LoadById($id);
@@ -226,7 +226,7 @@ if ( $request_path !~ qr{^/SelfService/} ) {
}
}
- if ( $request_path =~ qr'Admin/Queues' ) {
+ if ( $request_path =~ qr{Admin/Queues} ) {
if ( my $id = $m->request_args->{'id'} || $m->request_args->{'Queue'} ) {
my $queue_obj = RT::Queue->new( $session{'CurrentUser'} );
$queue_obj->Load($id);
@@ -260,7 +260,7 @@ if ( $request_path !~ qr{^/SelfService/} ) {
}
}
- if ( $request_path =~ qr'/Admin/Users' ) {
+ if ( $request_path =~ qr{/Admin/Users} ) {
if ( my $id = $m->request_args->{'id'} ) {
my $obj = RT::User->new( $session{'CurrentUser'} );
$obj->Load($id);
@@ -276,7 +276,7 @@ if ( $request_path !~ qr{^/SelfService/} ) {
}
- if ( $request_path =~ qr'Admin/Groups' ) {
+ if ( $request_path =~ qr{Admin/Groups} ) {
if ( my $id = $m->request_args->{'id'} ) {
my $obj = RT::Group->new( $session{'CurrentUser'} );
$obj->Load($id);
@@ -289,7 +289,7 @@ if ( $request_path !~ qr{^/SelfService/} ) {
}
}
- if ( $request_path =~ qr'Admin/CustomFields/' ) {
+ if ( $request_path =~ qr{Admin/CustomFields/} ) {
if ( my $id = $m->request_args->{'id'} ) {
my $obj = RT::CustomField->new( $session{'CurrentUser'} );
$obj->Load($id);
@@ -305,7 +305,7 @@ if ( $request_path !~ qr{^/SelfService/} ) {
}
- if ( $request_path =~ qr'Ticket/' ) {
+ if ( $request_path =~ qr{Ticket/} ) {
if ( ( $m->request_args->{'id'} || '' ) =~ /^(\d+)$/ ) {
my $id = $1;
my $obj = RT::Ticket->new( $session{'CurrentUser'} );
@@ -447,7 +447,7 @@ if ( $request_path !~ qr{^/SelfService/} ) {
}
}
}
- if ( $request_path =~ qr'(?:Ticket|Search)/' ) {
+ if ( $request_path =~ qr{(?:Ticket|Search)/} ) {
my $search = Menu()->child('search');
my $args = '';
my $has_query = '';
@@ -478,7 +478,7 @@ if ( $request_path !~ qr{^/SelfService/} ) {
my $current_search_menu;
- if ( $request_path =~ qr'^/Ticket' ) {
+ if ( $request_path =~ qr{^/Ticket} ) {
$current_search_menu = $search->child( current_search => title => loc('Current Search'), link_item => 1 );
} else {
$current_search_menu = PageMenu();
@@ -538,7 +538,7 @@ if ( $request_path !~ qr{^/SelfService/} ) {
$m->callback( CallbackName => 'Privileged' );
}
-if ( $request_path =~ qr'/SelfService' ) {
+if ( $request_path =~ qr{/SelfService} ) {
my $queues = RT::Queues->new( $session{'CurrentUser'} );
$queues->FindAllRows;
commit 66e9d395853d6c36634f7c9f0e801406294e8f28
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Mon Nov 29 19:20:31 2010 -0500
qr{xxx} in the dispatcher to qr{^/xxx}
diff --git a/share/html/Elements/Tabs b/share/html/Elements/Tabs
index 570f819..b434a7d 100755
--- a/share/html/Elements/Tabs
+++ b/share/html/Elements/Tabs
@@ -210,7 +210,7 @@ if ( $request_path !~ qr{^/SelfService/} ) {
|| RT->Config->Get('WebFallbackToInternalAuth') )) {
$about_me->child( logout => title => loc('Logout'), path => '/NoAuth/Logout.html' );
}
- if ( $request_path =~ qr{Dashboards/(\d+)?}) {
+ if ( $request_path =~ qr{^/Dashboards/(\d+)?}) {
if ( my $id = ( $1 || $m->request_args->{'id'} ) ) {
my $obj = RT::Dashboard->new( $session{'CurrentUser'} );
$obj->LoadById($id);
@@ -226,7 +226,7 @@ if ( $request_path !~ qr{^/SelfService/} ) {
}
}
- if ( $request_path =~ qr{Admin/Queues} ) {
+ if ( $request_path =~ qr{^/Admin/Queues} ) {
if ( my $id = $m->request_args->{'id'} || $m->request_args->{'Queue'} ) {
my $queue_obj = RT::Queue->new( $session{'CurrentUser'} );
$queue_obj->Load($id);
@@ -276,7 +276,7 @@ if ( $request_path !~ qr{^/SelfService/} ) {
}
- if ( $request_path =~ qr{Admin/Groups} ) {
+ if ( $request_path =~ qr{^/Admin/Groups} ) {
if ( my $id = $m->request_args->{'id'} ) {
my $obj = RT::Group->new( $session{'CurrentUser'} );
$obj->Load($id);
@@ -289,7 +289,7 @@ if ( $request_path !~ qr{^/SelfService/} ) {
}
}
- if ( $request_path =~ qr{Admin/CustomFields/} ) {
+ if ( $request_path =~ qr{^/Admin/CustomFields/} ) {
if ( my $id = $m->request_args->{'id'} ) {
my $obj = RT::CustomField->new( $session{'CurrentUser'} );
$obj->Load($id);
@@ -305,7 +305,7 @@ if ( $request_path !~ qr{^/SelfService/} ) {
}
- if ( $request_path =~ qr{Ticket/} ) {
+ if ( $request_path =~ qr{^/Ticket/} ) {
if ( ( $m->request_args->{'id'} || '' ) =~ /^(\d+)$/ ) {
my $id = $1;
my $obj = RT::Ticket->new( $session{'CurrentUser'} );
commit 79901541f1e9e8599cf82b0caf99fa253f867b80
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Mon Nov 29 19:21:00 2010 -0500
qr{/} to qr{^/} in the dispatcher
diff --git a/share/html/Elements/Tabs b/share/html/Elements/Tabs
index b434a7d..4a143c7 100755
--- a/share/html/Elements/Tabs
+++ b/share/html/Elements/Tabs
@@ -260,7 +260,7 @@ if ( $request_path !~ qr{^/SelfService/} ) {
}
}
- if ( $request_path =~ qr{/Admin/Users} ) {
+ if ( $request_path =~ qr{^/Admin/Users} ) {
if ( my $id = $m->request_args->{'id'} ) {
my $obj = RT::User->new( $session{'CurrentUser'} );
$obj->Load($id);
@@ -538,7 +538,7 @@ if ( $request_path !~ qr{^/SelfService/} ) {
$m->callback( CallbackName => 'Privileged' );
}
-if ( $request_path =~ qr{/SelfService} ) {
+if ( $request_path =~ qr{^/SelfService} ) {
my $queues = RT::Queues->new( $session{'CurrentUser'} );
$queues->FindAllRows;
commit 82b984c64ea21d21bcb1303e5c378b3a6d640647
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Mon Nov 29 19:23:04 2010 -0500
clean up some straggling dispatcher regexes
diff --git a/share/html/Elements/Tabs b/share/html/Elements/Tabs
index 4a143c7..8002a41 100755
--- a/share/html/Elements/Tabs
+++ b/share/html/Elements/Tabs
@@ -447,7 +447,7 @@ if ( $request_path !~ qr{^/SelfService/} ) {
}
}
}
- if ( $request_path =~ qr{(?:Ticket|Search)/} ) {
+ if ( $request_path =~ qr{^/(?:Ticket|Search)/} ) {
my $search = Menu()->child('search');
my $args = '';
my $has_query = '';
@@ -487,7 +487,7 @@ if ( $request_path !~ qr{^/SelfService/} ) {
path => "/Search/Build.html" . ( ($has_query) ? $args : '' ) );
$current_search_menu->child( loc('Advanced') => path => "/Search/Edit.html$args" );
if ($has_query) {
- if ($request_path =~ qr|^Search/Results.html|
+ if ($request_path =~ qr{^/Search/Results.html}
&& #XXX TODO better abstraction
$session{'CurrentUser'}->HasRight( Right => 'SuperUser', Object => $RT::System )) {
my $shred_args = URI->new->query_param(
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list