1 new changeset in galaxy-central: http://bitbucket.org/galaxy/galaxy-central/changeset/2fcf14f59875/ changeset: 2fcf14f59875 user: greg date: 2011-09-08 16:40:44 summary: Re-add the ability to display links to the same tool in more than one tool panel location, and add some recently introduced Galaxy config attributes to the tool shed app so exceptions won't be thrown. affected #: 3 files (203 bytes) --- a/lib/galaxy/tools/__init__.py Thu Sep 08 10:34:56 2011 -0400 +++ b/lib/galaxy/tools/__init__.py Thu Sep 08 10:40:44 2011 -0400 @@ -125,9 +125,9 @@ tta = self.app.model.ToolTagAssociation( tool_id=tool.id, tag_id=tag.id ) self.sa_session.add( tta ) self.sa_session.flush() - if tool.id in self.tools_by_id: - raise Exception( "Tool with id %s already loaded." % tool.id ) - else: + if tool.id not in self.tools_by_id: + # Allow for the same tool to be loaded into multiple places in the + # tool panel. self.tools_by_id[ tool.id ] = tool key = 'tool_' + tool.id panel_dict[ key ] = tool --- a/lib/galaxy/webapps/community/app.py Thu Sep 08 10:34:56 2011 -0400 +++ b/lib/galaxy/webapps/community/app.py Thu Sep 08 10:40:44 2011 -0400 @@ -1,5 +1,6 @@ import sys, config import galaxy.tools.data +import galaxy.quota import galaxy.datatypes.registry import galaxy.webapps.community.model from galaxy.web import security @@ -36,5 +37,6 @@ self.tool_data_tables = galaxy.tools.data.ToolDataTableManager( self.config.tool_data_table_config_path ) # Load security policy self.security_agent = self.model.security_agent + self.quota_agent = galaxy.quota.NoQuotaAgent( self.model ) def shutdown( self ): pass --- a/lib/galaxy/webapps/community/config.py Thu Sep 08 10:34:56 2011 -0400 +++ b/lib/galaxy/webapps/community/config.py Thu Sep 08 10:40:44 2011 -0400 @@ -39,6 +39,8 @@ self.file_path = resolve_path( kwargs.get( "file_path", "database/files" ), self.root ) self.new_file_path = resolve_path( kwargs.get( "new_file_path", "database/tmp" ), self.root ) self.cookie_path = kwargs.get( "cookie_path", "/" ) + # web API + self.enable_api = string_as_bool( kwargs.get( 'enable_api', 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!" ) 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.