Commits

Greg Von Kuster  committed e8a4a9b

Add disk_usage methods to tool shed's User model object - fixes server error when viewing User Preferences.

  • Participants
  • Parent commits ccbee8d

Comments (0)

Files changed (2)

File lib/galaxy/webapps/community/config.py

         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!" )

File lib/galaxy/webapps/community/model/__init__.py

     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 ):