1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/42d46284ef22/ Changeset: 42d46284ef22 User: dannon Date: 2014-06-09 16:42:33 Summary: Swap require_admin decorator and trans.user_is_amdin to use the newer correctly filtered admin_users_list in app.config Affected #: 1 file diff -r 749062450f1b531489524c12333a6d3e449d50c2 -r 42d46284ef22b9520b637661d3f15e31b5f5379a lib/galaxy/web/framework/__init__.py --- a/lib/galaxy/web/framework/__init__.py +++ b/lib/galaxy/web/framework/__init__.py @@ -370,9 +370,8 @@ def decorator( self, trans, *args, **kwargs ): if not trans.user_is_admin(): msg = "You must be an administrator to access this feature." - admin_users = trans.app.config.get( "admin_users", "" ).split( "," ) user = trans.get_user() - if not admin_users: + if not trans.app.config.admin_users_list: msg = "You must be logged in as an administrator to access this feature, but no administrators are set in the Galaxy configuration." elif not user: msg = "You must be logged in as an administrator to access this feature." @@ -1104,8 +1103,7 @@ def user_is_admin( self ): if self.api_inherit_admin: return True - admin_users = [ x.strip() for x in self.app.config.get( "admin_users", "" ).split( "," ) ] - return self.user and admin_users and self.user.email in admin_users + return self.user and self.user.email in self.app.config.admin_users_list def user_can_do_run_as( self ): run_as_users = [ user for user in self.app.config.get( "api_allow_run_as", "" ).split( "," ) if user ] Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.