opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-24 12:13:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1262 from carlfeberhard/fix.js-app-mako

Browse Source 
Managers, users: properly return a boolean from has_requests
This commit is contained in:
Martin Cech
2015-12-08 12:44:36 -05:00
parent fe1c9dd293 38a9aa6a5c
commit 6d16549a46
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/managers/users.py
+2 -3
View File
@@ -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 ):
@@ -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 )
})
test/unit/managers/test_UserManager.py
+1 -1
View File
@@ -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 )