Merge pull request #390 from uw-it-aca/fix/user-pref

fix no app user bug
uw-it-aca · Mar 21, 2024 · 76ad9bb · 76ad9bb
2 parents 5833059 + 21dda85
commit 76ad9bb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/compass/context_processors.py b/compass/context_processors.py
@@ -59,4 +59,5 @@ def auth_user(request):
 def user_preferences(request):
     us = UserService()
     netid = us.get_user()
-    return {'user_preferences': get_user_preferences(netid)}
+    user_prefs = get_user_preferences(netid)
+    return {'user_preferences': user_prefs if user_prefs else {}}
diff --git a/compass/dao/preferences.py b/compass/dao/preferences.py
@@ -13,9 +13,5 @@ def get_user_preferences(netid):
                 prefs[pref.component] = {}
             prefs[pref.component][pref.key] = pref.value
         return prefs
-    except AppUser.DoesNotExist:
-        return None
-    except UserPreference.DoesNotExist:
-        return None
-    except Exception:
+    except (AppUser.DoesNotExist, UserPreference.DoesNotExist, Exception):
         return None