Unverified Commit 4bc8b9a8 authored by John Chilton's avatar John Chilton Committed by GitHub
Browse files

Merge pull request #11708 from mvdbeek/make_all_extra_user_preferences_behave_like_defaultdict 

[20.09] Make extra user preferences behave like defaultdict
parents dffacde3 27b7d570

lib/galaxy/model/__init__.py

+1 −1
Original line number Diff line number Diff line
@@ -386,7 +386,7 @@ class User(Dictifiable, RepresentById): 
        extra_user_preferences = self.preferences.get('extra_user_preferences')

        if extra_user_preferences:

            try:

                data = json.loads(extra_user_preferences)

                data.update(json.loads(extra_user_preferences))

            except Exception:

                pass

        return data