[Rt-commit] rt branch, 4.0/delete-user-attributes-on-reset, updated. rt-4.0.4-114-g54149fb

[Jason May]

The branch, 4.0/delete-user-attributes-on-reset has been updated
       via  54149fba710aebc3cbbb9f3ca90d3598ddfe0849 (commit)
      from  2c91955866dd7e7b9da14c216785251f2e5e8dbb (commit)

Summary of changes:
 share/html/Elements/MyRT   |    2 +-
 share/html/Prefs/MyRT.html |   11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

- Log -----------------------------------------------------------------
commit 54149fba710aebc3cbbb9f3ca90d3598ddfe0849
Author: Jason May <jasonmay at bestpractical.com>
Date:   Wed Dec 7 19:18:31 2011 -0500

    Stop caching the default system prefs in the session
    
    This lets users blow away their preferences and track the system
    defaults instead of getting a snapshot of the defaults upon reset.

diff --git a/share/html/Elements/MyRT b/share/html/Elements/MyRT
index 37d8976..22a0e7d 100644
--- a/share/html/Elements/MyRT
+++ b/share/html/Elements/MyRT
@@ -70,7 +70,7 @@ my $user = $session{'CurrentUser'}->UserObj;
 $Portlets ||= $session{'my_rt_portlets'};
 unless ( $Portlets ) {
     my ($default_portlets) = RT::System->new($session{'CurrentUser'})->Attributes->Named('HomepageSettings');
-    $Portlets = $session{'my_rt_portlets'} = $user->Preferences(
+    $Portlets = $user->Preferences(
         HomepageSettings => $default_portlets? $default_portlets->Content: {},
     );
 }
diff --git a/share/html/Prefs/MyRT.html b/share/html/Prefs/MyRT.html
index 46848e1..d0f9786 100644
--- a/share/html/Prefs/MyRT.html
+++ b/share/html/Prefs/MyRT.html
@@ -104,12 +104,15 @@ if ($ARGS{Reset}) {
     delete $session{'my_rt_portlets'};
 }
 
-unless (exists $session{'my_rt_portlets'}) {
+my $portlets;
+if (exists $session{'my_rt_portlets'}) {
+    $portlets = $session{'my_rt_portlets'};
+}
+else {
     my ($default_portlets) = RT::System->new($session{'CurrentUser'})->Attributes->Named('HomepageSettings');
-    my $portlets = $default_portlets ? $default_portlets->Content : {};
-    $session{'my_rt_portlets'} = $user->Preferences('HomepageSettings', $portlets);
+    $default_portlets = $default_portlets ? $default_portlets->Content : {};
+    $portlets = $user->Preferences('HomepageSettings', $default_portlets);
 }
-my $portlets = $session{'my_rt_portlets'};
 
 my %seen;
 my @items = map ["component-$_", $_], grep !$seen{$_}++, @{RT->Config->Get('HomepageComponents')};

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