From e4a97c88d04894110d03881316573367b183cba6 Mon Sep 17 00:00:00 2001 From: guerler Date: Tue, 8 Nov 2016 16:57:02 -0500 Subject: [PATCH 1/2] Remove unused dict values from get_information endpoint --- lib/galaxy/webapps/galaxy/api/users.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/galaxy/webapps/galaxy/api/users.py b/lib/galaxy/webapps/galaxy/api/users.py index 14ed03b180f7..e863475cb05c 100644 --- a/lib/galaxy/webapps/galaxy/api/users.py +++ b/lib/galaxy/webapps/galaxy/api/users.py @@ -318,8 +318,6 @@ def get_information(self, trans, id, **kwd): else: inputs.append(dict(id='name_input', name='username', label='Public name:', type='text', value=username, help='Your public name provides a means of identifying you publicly within this tool shed. Public names must be at least three characters in length and contain only lower-case letters, numbers, and the "-" character. You cannot change your public name after you have created a repository in this tool shed.')) return { - 'webapp': trans.webapp.name, - 'is_admin': trans.user_is_admin(), 'email': email, 'username': username, 'addresses': [address.to_dict(trans) for address in user.addresses], From 46acf5c7bd42d2d58d4494d8adcc0325e4e9e9d0 Mon Sep 17 00:00:00 2001 From: guerler Date: Tue, 8 Nov 2016 20:19:18 -0500 Subject: [PATCH 2/2] Add missing sql component --- lib/galaxy/webapps/galaxy/api/users.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/galaxy/webapps/galaxy/api/users.py b/lib/galaxy/webapps/galaxy/api/users.py index e863475cb05c..a7ab021a1881 100644 --- a/lib/galaxy/webapps/galaxy/api/users.py +++ b/lib/galaxy/webapps/galaxy/api/users.py @@ -6,7 +6,7 @@ import datetime import re -from sqlalchemy import false, true, or_ +from sqlalchemy import false, true, and_, or_ from galaxy import exceptions, util, web from galaxy.exceptions import MessageException