[Rt-commit] rt branch, 4.0/merge-prefs-and-user, updated. rt-4.0.0-178-gb73898d

? sunnavy sunnavy at bestpractical.com
Thu May 5 00:08:19 EDT 2011


The branch, 4.0/merge-prefs-and-user has been updated
       via  b73898d0131f8bc0816447d1c03700af71152a14 (commit)
      from  c5edd5da98a78e958d1f54d040ee13f536178e40 (commit)

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

- Log -----------------------------------------------------------------
commit b73898d0131f8bc0816447d1c03700af71152a14
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Thu May 5 11:52:33 2011 +0800

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

diff --git a/share/html/Elements/Tabs b/share/html/Elements/Tabs
index 6cce799..21117c7 100755
--- a/share/html/Elements/Tabs
+++ b/share/html/Elements/Tabs
@@ -390,7 +390,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( quicksearch => title => 'Quick search' => title => loc('Quick search'), path => '/Prefs/Quicksearch.html');
diff --git a/share/html/User/Prefs.html b/share/html/Prefs/AboutMe.html
similarity index 99%
rename from share/html/User/Prefs.html
rename to share/html/Prefs/AboutMe.html
index 863ebf9..dd56281 100755
--- a/share/html/User/Prefs.html
+++ b/share/html/Prefs/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 e4af752..4868f87 100644
--- a/t/web/rights1.t
+++ b/t/web/rights1.t
@@ -31,7 +31,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

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


More information about the Rt-commit mailing list