From 7256279252d4053c5c2afa9a7cce5652fe4ad6da Mon Sep 17 00:00:00 2001 From: guerler Date: Mon, 1 Nov 2021 13:06:05 -0400 Subject: [PATCH] Use string to boolean --- lib/galaxy/webapps/galaxy/api/users.py | 2 +- lib/galaxy/webapps/galaxy/controllers/admin.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/galaxy/webapps/galaxy/api/users.py b/lib/galaxy/webapps/galaxy/api/users.py index 1254bf3a56e..e481d295df3 100644 --- a/lib/galaxy/webapps/galaxy/api/users.py +++ b/lib/galaxy/webapps/galaxy/api/users.py @@ -669,7 +669,7 @@ class UserAPIController(BaseGalaxyAPIController, UsesTagsMixin, BaseUIController for filter_type in filter_types: new_filters = [] for prefixed_name in payload: - if bool(payload.get(prefixed_name)) and prefixed_name.startswith(filter_type): + if util.string_as_bool(payload.get(prefixed_name)) and prefixed_name.startswith(filter_type): prefix = f"{filter_type}|" new_filters.append(prefixed_name[len(prefix):]) user.preferences[filter_type] = ','.join(new_filters) diff --git a/lib/galaxy/webapps/galaxy/controllers/admin.py b/lib/galaxy/webapps/galaxy/controllers/admin.py index 3fb454fc531..e4ce66a230f 100644 --- a/lib/galaxy/webapps/galaxy/controllers/admin.py +++ b/lib/galaxy/webapps/galaxy/controllers/admin.py @@ -978,7 +978,7 @@ class AdminGalaxy(controller.JSAppLauncher): else: name = util.restore_text(payload.get('name', '')) description = util.restore_text(payload.get('description', '')) - auto_create_checked = bool(payload.get('auto_create')) + auto_create_checked = util.string_as_bool(payload.get('auto_create')) in_users = [trans.sa_session.query(trans.app.model.User).get(trans.security.decode_id(x)) for x in util.listify(payload.get('in_users'))] in_groups = [trans.sa_session.query(trans.app.model.Group).get(trans.security.decode_id(x)) for x in util.listify(payload.get('in_groups'))] if not name or not description: @@ -1292,7 +1292,7 @@ class AdminGalaxy(controller.JSAppLauncher): } else: name = util.restore_text(payload.get('name', '')) - auto_create_checked = bool(payload.get('auto_create')) + auto_create_checked = util.string_as_bool(payload.get('auto_create')) in_users = [trans.sa_session.query(trans.app.model.User).get(trans.security.decode_id(x)) for x in util.listify(payload.get('in_users'))] in_roles = [trans.sa_session.query(trans.app.model.Role).get(trans.security.decode_id(x)) for x in util.listify(payload.get('in_roles'))] if not name: