[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.9.4-404-g2e10673

[Jesse Vincent]

The branch, 3.9-trunk has been updated
       via  2e10673df970d30dc194967ad6cde435808c2e39 (commit)
       via  ef08cc2dcb2ecddcf359f91f3ec2326f9ad4f717 (commit)
      from  b9b4b02b4639898cf7344ce0c83e3d507c048700 (commit)

Summary of changes:
 sbin/rt-test-dependencies.in |    4 ++--
 share/html/Elements/Tabs     |    6 +++---
 t/web/walk.t                 |    6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

- Log -----------------------------------------------------------------
commit ef08cc2dcb2ecddcf359f91f3ec2326f9ad4f717
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Fri Nov 5 12:44:14 2010 -0400

    Move PSGI dev dependencies into the dev section

diff --git a/sbin/rt-test-dependencies.in b/sbin/rt-test-dependencies.in
index f0a1019..4fdb63d 100755
--- a/sbin/rt-test-dependencies.in
+++ b/sbin/rt-test-dependencies.in
@@ -234,9 +234,7 @@ CGI::PSGI 0.12
 HTML::Mason::PSGIHandler 0.52
 Plack 0.9942
 Plack::Handler::Starlet
-Test::WWW::Mechanize::PSGI
 CGI::Emulate::PSGI
-Plack::Middleware::Test::StashWarnings
 .
 
 $deps{'MAILGATE'} = [ text_to_hash( << '.') ];
@@ -275,6 +273,8 @@ Test::Builder 0.77 # needed to fix TODO test
 Test::MockTime
 Log::Dispatch::Perl
 Web::Scraper
+Test::WWW::Mechanize::PSGI
+Plack::Middleware::Test::StashWarnings
 .
 
 $deps{'FASTCGI'} = [ text_to_hash( << '.') ];

commit 2e10673df970d30dc194967ad6cde435808c2e39
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Fri Nov 5 22:50:11 2010 -0400

    Fix page menuing on user/group/cf admin.
    
    Fixes [rt4 #15979]

diff --git a/share/html/Elements/Tabs b/share/html/Elements/Tabs
index 645151e..cbfe625 100755
--- a/share/html/Elements/Tabs
+++ b/share/html/Elements/Tabs
@@ -262,7 +262,7 @@ if ( $request_path !~ qr{^/SelfService/} ) {
         if ( my $id = $m->request_args->{'id'} ) {
             my $obj = RT::User->new( $session{'CurrentUser'} );
             $obj->Load($id);
-            my $tabs = PageMenu->child( 'current' => title => $obj->Name, path => "/Admin/Users/Modify.html?id=" . $id,);
+            my $tabs = PageMenu();
             $tabs->child( basics => title => loc('Basics'), path => "/Admin/Users/Modify.html?id=" . $id );
             $tabs->child( memberships => title => loc('Memberships'), path => "/Admin/Users/Memberships.html?id=" . $id );
             $tabs->child( history => title => loc('History'), path => "/Admin/Users/History.html?id=" . $id );
@@ -278,7 +278,7 @@ if ( $request_path !~ qr{^/SelfService/} ) {
         if ( my $id = $m->request_args->{'id'} ) {
             my $obj = RT::Group->new( $session{'CurrentUser'} );
             $obj->Load($id);
-            my $tabs = PageMenu->child( $obj->Name, path => "/Admin/Groups/Modify.html?id=" . $id );
+            my $tabs = PageMenu();
             $tabs->child( basics => title => loc('Basics') => path => "/Admin/Groups/Modify.html?id=" . $obj->id );
             $tabs->child( members => title => loc('Members') => path => "/Admin/Groups/Members.html?id=" . $obj->id );
             $tabs->child( 'group-rights' => title => loc('Group Rights') => path => "/Admin/Groups/GroupRights.html?id=" . $obj->id );
@@ -291,7 +291,7 @@ if ( $request_path !~ qr{^/SelfService/} ) {
         if ( my $id = $m->request_args->{'id'} ) {
             my $obj = RT::CustomField->new( $session{'CurrentUser'} );
             $obj->Load($id);
-            my $tabs = PageMenu->child( $obj->Name => path => "/Admin/CustomFields/Modify.html?id=" . $id );
+            my $tabs = PageMenu();
 
             $tabs->child( basics => title => loc('Basics') => path => "/Admin/CustomFields/Modify.html?id=".$id );
             $tabs->child( 'group-rights' => title => loc('Group Rights') => path => "/Admin/CustomFields/GroupRights.html?id=" . $id );
diff --git a/t/web/walk.t b/t/web/walk.t
index 3837191..58de38e 100644
--- a/t/web/walk.t
+++ b/t/web/walk.t
@@ -53,7 +53,7 @@ diag 'walk into /Admin' if $ENV{TEST_VERBOSE};
 
         $m->follow_link_ok( { text => 'root' }, '-> root' );
         for my $id ( 'my-rt', 'memberships', 'history', 'basics' ) {
-            $m->follow_link_ok( { id => 'page-current-' . $id }, "-> $id" );
+            $m->follow_link_ok( { id => 'page-' . $id }, "-> $id" );
         }
     }
 
@@ -72,7 +72,7 @@ diag 'walk into /Admin' if $ENV{TEST_VERBOSE};
         for my $id ( 'history', 'members', 'group-rights', 'user-rights',
             'basics' )
         {
-            $m->follow_link_ok( { id => 'page-group_foo-' . $id }, "-> $id" );
+            $m->follow_link_ok( { id => 'page-' . $id }, "-> $id" );
         }
     }
 
@@ -115,7 +115,7 @@ diag 'walk into /Admin' if $ENV{TEST_VERBOSE};
         $m->follow_link_ok( { text => 'cf_foo' }, '-> cf_foo' );
 
         for my $id ( 'applies-to', 'group-rights', 'user-rights', 'basics' ) {
-            $m->follow_link_ok( { id => 'page-cf_foo-' . $id }, "-> $id" );
+            $m->follow_link_ok( { id => 'page-' . $id }, "-> $id" );
         }
     }
 

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