From 7f4c3fcfc88914cb91e325fe95f08c90c034ef3e Mon Sep 17 00:00:00 2001 From: carlfeberhard Date: Tue, 8 Dec 2015 11:20:16 -0500 Subject: [PATCH 1/2] Managers, users: properly return a boolean from has_requests --- lib/galaxy/managers/users.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/galaxy/managers/users.py b/lib/galaxy/managers/users.py index 4a130b23fa2..b27e651bd9e 100644 --- a/lib/galaxy/managers/users.py +++ b/lib/galaxy/managers/users.py @@ -235,7 +235,7 @@ class UserManager( base.ModelManager, deletable.PurgableManagerMixin ): if self.is_anonymous( user ): return False request_types = self.app.security_agent.get_accessible_request_types( trans, user ) - return ( user.requests or request_types ) + return bool( user.requests or request_types ) class UserSerializer( base.ModelSerializer, deletable.PurgableSerializerMixin ): From 38a9aa6a5c3b006867e16877999545e1e0e7ddea Mon Sep 17 00:00:00 2001 From: carlfeberhard Date: Tue, 8 Dec 2015 11:43:15 -0500 Subject: [PATCH 2/2] Managers, users: update serialized key 'requests' to 'has_requests', update test --- lib/galaxy/managers/users.py | 3 +-- test/unit/managers/test_UserManager.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/galaxy/managers/users.py b/lib/galaxy/managers/users.py index b27e651bd9e..fe1e7dd1f11 100644 --- a/lib/galaxy/managers/users.py +++ b/lib/galaxy/managers/users.py @@ -283,8 +283,7 @@ class UserSerializer( base.ModelSerializer, deletable.PurgableSerializerMixin ): 'quota_percent' : lambda i, k, **c: self.user_manager.quota( i ), 'tags_used' : lambda i, k, **c: self.user_manager.tags_used( i ), - # TODO: 'has_requests' is more apt - 'requests' : lambda i, k, trans=None, **c: self.user_manager.has_requests( i, trans ) + 'has_requests' : lambda i, k, trans=None, **c: self.user_manager.has_requests( i, trans ) }) diff --git a/test/unit/managers/test_UserManager.py b/test/unit/managers/test_UserManager.py index 8f37b6fba76..a4769101ac5 100644 --- a/test/unit/managers/test_UserManager.py +++ b/test/unit/managers/test_UserManager.py @@ -182,7 +182,7 @@ class UserSerializerTestCase( BaseTestCase ): self.assertIsInstance( serialized[ 'nice_total_disk_usage' ], basestring ) self.assertIsInstance( serialized[ 'quota_percent' ], ( type( None ), float ) ) self.assertIsInstance( serialized[ 'tags_used' ], list ) - self.assertIsInstance( serialized[ 'requests' ], list ) + self.assertIsInstance( serialized[ 'has_requests' ], bool ) self.log( 'serialized should jsonify well' ) self.assertIsJsonifyable( serialized )