1 new commit in galaxy-central:

https://bitbucket.org/galaxy/galaxy-central/changeset/e8a4a9b1ed14/ changeset: e8a4a9b1ed14 user: greg date: 2011-11-18 20:04:29 summary: Add disk_usage methods to tool shed's User model object - fixes server error when viewing User Preferences. affected #: 2 files

diff -r ccbee8d11a6a75b8cee78cc9647a31e0dc32894c -r e8a4a9b1ed1460ac259d5ed4a188906a47ff2a7e lib/galaxy/webapps/community/config.py --- a/lib/galaxy/webapps/community/config.py +++ b/lib/galaxy/webapps/community/config.py @@ -41,6 +41,7 @@ self.cookie_path = kwargs.get( "cookie_path", "/" ) # web API self.enable_api = string_as_bool( kwargs.get( 'enable_api', False ) ) + self.enable_quotas = string_as_bool( kwargs.get( 'enable_quotas', False ) ) self.datatypes_config = kwargs.get( 'datatypes_config_file', 'datatypes_conf.xml' ) self.test_conf = resolve_path( kwargs.get( "test_conf", "" ), self.root ) self.id_secret = kwargs.get( "id_secret", "USING THE DEFAULT IS NOT SECURE!" )

diff -r ccbee8d11a6a75b8cee78cc9647a31e0dc32894c -r e8a4a9b1ed1460ac259d5ed4a188906a47ff2a7e lib/galaxy/webapps/community/model/__init__.py --- a/lib/galaxy/webapps/community/model/__init__.py +++ b/lib/galaxy/webapps/community/model/__init__.py @@ -26,6 +26,14 @@ def check_password( self, cleartext ): """Check if 'cleartext' matches 'self.password' when hashed.""" return self.password == new_secure_hash( text_type=cleartext ) + def get_disk_usage( self, nice_size=False ): + return 0 + def set_disk_usage( self, bytes ): + pass + total_disk_usage = property( get_disk_usage, set_disk_usage ) + @property + def nice_total_disk_usage( self ): + return 0

class Group( object ): def __init__( self, name = None ):

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.