[Rt-commit] rt branch, 4.2/merge-prefs-and-user, updated. rt-4.0.0rc7-249-g4065b42

[? sunnavy]

The branch, 4.2/merge-prefs-and-user has been updated
       via  4065b42f715e807ef51b78737a7931016dbfc7fe (commit)
      from  4bf6d3255a2760b44e51303ee0e58d951fee85d7 (commit)

Summary of changes:
 share/html/Elements/Tabs                     |    2 +-
 share/html/User/{Prefs.html => AboutMe.html} |    2 +-
 t/web/rights1.t                              |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename share/html/User/{Prefs.html => AboutMe.html} (99%)

- Log -----------------------------------------------------------------
commit 4065b42f715e807ef51b78737a7931016dbfc7fe
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Tue May 10 11:51:56 2011 +0800

    merge /User/ and /Prefs/, see also #14200

diff --git a/share/html/Elements/Tabs b/share/html/Elements/Tabs
index 7a3299f..fdacbca 100755
--- a/share/html/Elements/Tabs
+++ b/share/html/Elements/Tabs
@@ -424,7 +424,7 @@ my $build_admin_menu = sub {
          && $session{'CurrentUser'}->HasRight( Right  => 'ModifySelf', Object => RT->System )) {
         my $settings = $about_me->child( settings => title => loc('Settings'), path => '/Prefs/Other.html', );
         $settings->child( options => title => loc('Options'), path     => '/Prefs/Other.html', );
-        $settings->child( about_me => title => loc('About me'), path     => '/User/Prefs.html', );
+        $settings->child( about_me => title => loc('About me'), path     => '/Prefs/AboutMe.html', );
         $settings->child( search_options => title => loc('Search options'), path => '/Prefs/SearchOptions.html', );
         $settings->child( myrt => title => loc('RT at a glance'), path => '/Prefs/MyRT.html', );
         $settings->child( dashboards_in_menu => title => loc('Dashboards in menu'),
diff --git a/share/html/User/Prefs.html b/share/html/User/AboutMe.html
similarity index 99%
rename from share/html/User/Prefs.html
rename to share/html/User/AboutMe.html
index 0ace58a..e2cc17d 100755
--- a/share/html/User/Prefs.html
+++ b/share/html/User/AboutMe.html
@@ -50,7 +50,7 @@
 
 <& /Elements/ListActions, actions => \@results &>
 
-<form action="<%RT->Config->Get('WebPath')%>/User/Prefs.html" method="post">
+<form action="<%RT->Config->Get('WebPath')%>/Prefs/AboutMe.html" method="post">
 <input type="hidden" class="hidden" name="id" value="<%$UserObj->Id%>" />
 
 <table width="100%" border="0">
diff --git a/t/web/rights1.t b/t/web/rights1.t
index c5f6bfb..023ea27 100644
--- a/t/web/rights1.t
+++ b/t/web/rights1.t
@@ -30,7 +30,7 @@ $agent->login( $user_obj->Name, 'customer');
 # Test for absence of Configure and Preferences tabs.
 ok(!$agent->find_link( url => "$RT::WebPath/Admin/",
 		       text => 'Configuration'), "No config tab" );
-ok(!$agent->find_link( url => "$RT::WebPath/User/Prefs.html",
+ok(!$agent->find_link( url => "$RT::WebPath/Prefs/AboutMe.html",
 		       text => 'Preferences'), "No prefs pane" );
 
 # Now test for their presence, one at a time.  Sleep for a bit after

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