commit 7187981def2deca747a98acbb41239781fb50c7f
author Shawn O. Pearce <sop@google.com> Wed Jun 16 19:15:35 2010 -0700
committer Shawn O. Pearce <sop@google.com> Wed Jun 16 19:15:35 2010 -0700
tree 4837a8598a4ff746c73149d09b31642fff59ae43
parent e800b1e0f3452e5be1537a67f1fa3e44a58c6dda

Fix user site header/footer preference

The user's site header/footer flag wasn't being honored when the
page loaded.  The startup code was applying the user's preference
before the header/footer existed, resulting in the value never
being applied.  Delay the user preferences until we have the UI
more fully initialized.

Bug: issue 587
Change-Id: I87cfa210c5b371144aa18df54f1274964513a3c0
Signed-off-by: Shawn O. Pearce <sop@google.com>

gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java
index d6a4995..9249f5e 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java
@@ -233,7 +233,6 @@
         myConfig = result.config;
         if (result.account != null) {
           myAccount = result.account;
-          applyUserPreferences();
         }
         onModuleLoad2();
       }
@@ -370,6 +369,7 @@
         gStarting.getElement());
     RootPanel.detachNow(gStarting);
 
+    applyUserPreferences();
     initHistoryHooks();
     populateBottomMenu(gBottomMenu);
     refreshMenuBar();
@@ -476,12 +476,10 @@
   }
 
   public static void applyUserPreferences() {
-    final AccountGeneralPreferences p = myAccount.getGeneralPreferences();
-    CopyableLabel.setFlashEnabled(p.isUseFlashClipboard());
-    if (siteHeader != null) {
+    if (myAccount != null) {
+      final AccountGeneralPreferences p = myAccount.getGeneralPreferences();
+      CopyableLabel.setFlashEnabled(p.isUseFlashClipboard());
       siteHeader.setVisible(p.isShowSiteHeader());
-    }
-    if (siteFooter != null) {
       siteFooter.setVisible(p.isShowSiteHeader());
     }
   }