1. kmdaily
  2. galaxy-central

Commits

Greg Von Kuster  committed 2fcf14f

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.

  • Participants
  • Parent commits 314d41d
  • Branches default

Comments (0)

Files changed (3)

File lib/galaxy/tools/__init__.py

View file
                             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

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

View file
 import sys, config
 import galaxy.tools.data
+import galaxy.quota
 import galaxy.datatypes.registry
 import galaxy.webapps.community.model
 from galaxy.web import security
         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

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

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