[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.9.7-868-gf779a94
Shawn Moore
sartak at bestpractical.com
Mon Dec 13 22:36:53 EST 2010
The branch, 3.9-trunk has been updated
via f779a94ab9349db3e56d6bbb95e01042912134fe (commit)
from 837152112df456da10114c56c14215193bcc478c (commit)
Summary of changes:
share/html/Elements/Tabs | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
- Log -----------------------------------------------------------------
commit f779a94ab9349db3e56d6bbb95e01042912134fe
Author: Shawn M Moore <sartak at bestpractical.com>
Date: Mon Dec 13 22:36:40 2010 -0500
use =~ m{} instead of =~ qr{}
diff --git a/share/html/Elements/Tabs b/share/html/Elements/Tabs
index 80df6b7..f4e3957 100755
--- a/share/html/Elements/Tabs
+++ b/share/html/Elements/Tabs
@@ -58,7 +58,7 @@ my $query_string = sub {
return $u->query;
};
-if ( $request_path !~ qr{^/SelfService/} ) {
+if ( $request_path !~ m{^/SelfService/} ) {
my $home = Menu->child( home => title => loc('Homepage'), path => '/' );
my @dashboards = $m->comp("/Dashboards/Elements/ListOfDashboards");
my $limit = 7;
@@ -243,7 +243,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 =~ m{^/Dashboards/(\d+)?}) {
if ( my $id = ( $1 || $m->request_args->{'id'} ) ) {
my $obj = RT::Dashboard->new( $session{'CurrentUser'} );
$obj->LoadById($id);
@@ -259,7 +259,7 @@ if ( $request_path !~ qr{^/SelfService/} ) {
}
}
- if ( $request_path =~ qr{^/Admin/(Queues|Users|Groups|CustomFields)} ) {
+ if ( $request_path =~ m{^/Admin/(Queues|Users|Groups|CustomFields)} ) {
my $type = $1;
my $tabs = PageMenu();
@@ -272,8 +272,8 @@ if ( $request_path !~ qr{^/SelfService/} ) {
);
my $section;
- if ( $request_path =~ qr{^/Admin/$type/?(?:index.html)?$}
- || ( $request_path =~ qr{^/Admin/$type/(?:Modify.html)$}
+ if ( $request_path =~ m{^/Admin/$type/?(?:index.html)?$}
+ || ( $request_path =~ m{^/Admin/$type/(?:Modify.html)$}
&& $m->request_args->{'Create'} )
)
@@ -291,7 +291,7 @@ if ( $request_path !~ qr{^/SelfService/} ) {
path => "/Admin/$type/Modify.html?Create=1" );
}
- if ( $request_path =~ qr{^/Admin/Queues} ) {
+ if ( $request_path =~ m{^/Admin/Queues} ) {
if ( $m->request_args->{'id'} && $m->request_args->{'id'} =~ /^\d+$/
||
$m->request_args->{'Queue'} && $m->request_args->{'Queue'} =~ /^\d+$/
@@ -329,7 +329,7 @@ if ( $request_path !~ qr{^/SelfService/} ) {
}
}
- if ( $request_path =~ qr{^/Admin/Users} ) {
+ if ( $request_path =~ m{^/Admin/Users} ) {
if ( $m->request_args->{'id'} && $m->request_args->{'id'} =~ /^\d+$/ ) {
my $id = $m->request_args->{'id'};
my $obj = RT::User->new( $session{'CurrentUser'} );
@@ -346,7 +346,7 @@ if ( $request_path !~ qr{^/SelfService/} ) {
}
- if ( $request_path =~ qr{^/Admin/Groups} ) {
+ if ( $request_path =~ m{^/Admin/Groups} ) {
if ( $m->request_args->{'id'} && $m->request_args->{'id'} =~ /^\d+$/ ) {
my $id = $m->request_args->{'id'};
my $obj = RT::Group->new( $session{'CurrentUser'} );
@@ -360,7 +360,7 @@ if ( $request_path !~ qr{^/SelfService/} ) {
}
}
- if ( $request_path =~ qr{^/Admin/CustomFields/} ) {
+ if ( $request_path =~ m{^/Admin/CustomFields/} ) {
if ( $m->request_args->{'id'} && $m->request_args->{'id'} =~ /^\d+$/ ) {
my $id = $m->request_args->{'id'};
my $obj = RT::CustomField->new( $session{'CurrentUser'} );
@@ -377,7 +377,7 @@ if ( $request_path !~ qr{^/SelfService/} ) {
}
- if ( $request_path =~ qr{^/Admin/Global/(Scrip|Template)s?\.html} ) {
+ if ( $request_path =~ m{^/Admin/Global/(Scrip|Template)s?\.html} ) {
my $type = $1;
my $tabs = PageMenu();
@@ -396,7 +396,7 @@ if ( $request_path !~ qr{^/SelfService/} ) {
}
- if ( $request_path =~ qr{^/Admin/Articles/Classes/} ) {
+ if ( $request_path =~ m{^/Admin/Articles/Classes/} ) {
if ( my $id = $m->request_args->{'id'} ) {
my $obj = RT::CustomField->new( $session{'CurrentUser'} );
$obj->Load($id);
@@ -411,7 +411,7 @@ if ( $request_path !~ qr{^/SelfService/} ) {
}
- if ( $request_path =~ qr{^/Ticket/} ) {
+ if ( $request_path =~ m{^/Ticket/} ) {
if ( ( $m->request_args->{'id'} || '' ) =~ /^(\d+)$/ ) {
my $id = $1;
my $obj = RT::Ticket->new( $session{'CurrentUser'} );
@@ -545,7 +545,7 @@ if ( $request_path !~ qr{^/SelfService/} ) {
}
}
}
- if ( $request_path =~ qr{^/(?:Ticket|Search)/} && $request_path !~ qr{^/Search/Simple\.html}) {
+ if ( $request_path =~ m{^/(?:Ticket|Search)/} && $request_path !~ m{^/Search/Simple\.html}) {
my $search = Menu()->child('search');
my $args = '';
my $has_query = '';
@@ -576,7 +576,7 @@ if ( $request_path !~ qr{^/SelfService/} ) {
my $current_search_menu;
- if ( $request_path =~ qr{^/Ticket} ) {
+ if ( $request_path =~ m{^/Ticket} ) {
$current_search_menu = $search->child( current_search => title => loc('Current Search') );
$current_search_menu->path("/Search/Results.html$args") if $has_query;
} else {
@@ -586,7 +586,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 =~ m{^/Search/Results.html}
&& #XXX TODO better abstraction
$session{'CurrentUser'}->HasRight( Right => 'SuperUser', Object => $RT::System )) {
my $shred_args = $query_string->(
@@ -630,7 +630,7 @@ if ( $request_path !~ qr{^/SelfService/} ) {
}
}
- if ( $request_path =~ qr{^/Article/} ) {
+ if ( $request_path =~ m{^/Article/} ) {
if ( $m->request_args->{'id'} && $m->request_args->{'id'} =~ /^\d+$/ ) {
my $id = $m->request_args->{'id'};
my $tabs = PageMenu();
@@ -642,7 +642,7 @@ if ( $request_path !~ qr{^/SelfService/} ) {
}
}
- if ( $request_path =~ qr{^/Articles/} ) {
+ if ( $request_path =~ m{^/Articles/} ) {
my $tabs = PageMenu();
$tabs->child( search => path => "/Articles/Article/Search.html", title => loc("Search") );
$tabs->child( create => path => "/Articles/Article/PreCreate.html", title => loc("New Article" ) );
@@ -674,7 +674,7 @@ if ( $request_path !~ qr{^/SelfService/} ) {
$m->callback( CallbackName => 'Privileged' );
}
-if ( $request_path =~ qr{^/SelfService} ) {
+if ( $request_path =~ m{^/SelfService} ) {
my $queues = RT::Queues->new( $session{'CurrentUser'} );
$queues->FindAllRows;
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list