From 9556c467e3a4c9947939f8444873530b53b39c20 Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Mon, 4 Sep 2017 17:08:59 +0200 Subject: [PATCH] Check user roles only once if user has no roles The previous implementation in #4541 would check user roles multiple times if a user has no roles. Noticed by @nsoranzo, many thanks! --- lib/galaxy/work/context.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/galaxy/work/context.py b/lib/galaxy/work/context.py index 02306dbf0e8..dd4fe4bebb6 100644 --- a/lib/galaxy/work/context.py +++ b/lib/galaxy/work/context.py @@ -42,9 +42,8 @@ class WorkRequestContext(ProvidesAppContext, ProvidesUserContext, ProvidesHistor return self.__user def get_current_user_roles(self): - if not self.__user_current_roles: - if self.__user: - self.__user_current_roles = self.__user.all_roles() + if self.__user_current_roles is None: + self.__user_current_roles = super(WorkRequestContext, self).get_current_user_roles() return self.__user_current_roles def set_user(self, user):