[Rt-commit] rt branch, rt-at-a-glance-renames, updated. rt-3.9.7-893-g209b817

[Shawn Moore]

The branch, rt-at-a-glance-renames has been updated
       via  209b817a7d5d26a3c471f8033762f0f409ab9a04 (commit)
       via  2f910d41f64929921e4d876f3fa7d04ad43eadb3 (commit)
      from  065e3ed479cfa0a4ab118b8f2fea0dafd12bff28 (commit)

Summary of changes:
 etc/upgrade/3.9.9/content |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

- Log -----------------------------------------------------------------
commit 2f910d41f64929921e4d876f3fa7d04ad43eadb3
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Wed Dec 15 23:50:29 2010 -0500

    Skip updating user prefs when there's a sidebar already

diff --git a/etc/upgrade/3.9.9/content b/etc/upgrade/3.9.9/content
index 273bf95..03bc20e 100644
--- a/etc/upgrade/3.9.9/content
+++ b/etc/upgrade/3.9.9/content
@@ -6,6 +6,8 @@
         while (my $user = $users->Next) {
             my $settings = $user->Preferences('HomepageSettings')
                 or next;
+            next if exists $settings->{sidebar};
+
             $settings->{sidebar} = delete $settings->{summary};
             $user->SetPreferences('HomepageSettings', $settings);
         }

commit 209b817a7d5d26a3c471f8033762f0f409ab9a04
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Wed Dec 15 23:53:58 2010 -0500

    Upgrade the default HomepageSettings too

diff --git a/etc/upgrade/3.9.9/content b/etc/upgrade/3.9.9/content
index 03bc20e..80783eb 100644
--- a/etc/upgrade/3.9.9/content
+++ b/etc/upgrade/3.9.9/content
@@ -12,6 +12,14 @@
             $user->SetPreferences('HomepageSettings', $settings);
         }
     },
+    sub {
+        my ($default_portlets) = RT->System->Attributes->Named('HomepageSettings');
+        my $settings = $default_portlets->Content;
+        return if exists $settings->{sidebar};
+
+        $settings->{sidebar} = delete $settings->{summary};
+        $default_portlets->SetContent($settings);
+    },
 );
 
 

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