1 new changeset in galaxy-central:

http://bitbucket.org/galaxy/galaxy-central/changeset/98041300775e/ changeset: 98041300775e user: greg date: 2011-10-13 22:09:28 summary: Clarify tool searches in the tool shed. Searches are retricted to only tools that properly load in Galaxy. affected #: 3 files (-1 bytes)

--- a/lib/galaxy/webapps/community/controllers/repository.py Thu Oct 13 15:35:45 2011 -0400 +++ b/lib/galaxy/webapps/community/controllers/repository.py Thu Oct 13 16:09:28 2011 -0400 @@ -293,7 +293,12 @@ params = util.Params( kwd ) message = util.restore_text( params.get( 'message', '' ) ) status = params.get( 'status', 'done' ) - return trans.fill_template( '/webapps/community/index.mako', message=message, status=status ) + # See if there are any RepositoryMetadata records since menu items require them. + repository_metadata = trans.sa_session.query( model.RepositoryMetadata ).first() + return trans.fill_template( '/webapps/community/index.mako', + repository_metadata=repository_metadata, + message=message, + status=status ) @web.expose def browse_categories( self, trans, **kwd ): if 'f-free-text-search' in kwd: @@ -400,7 +405,7 @@ exact_matches_checked = CheckboxField.is_checked( exact_matches ) match_tuples = [] if tool_id or tool_name or tool_version: - for repository_metadata in trans.sa_session.query( model.RepositoryMetadata.table ).all(): + for repository_metadata in trans.sa_session.query( model.RepositoryMetadata ): metadata = repository_metadata.metadata tools = metadata[ 'tools' ] found = False

--- a/templates/webapps/community/index.mako Thu Oct 13 15:35:45 2011 -0400 +++ b/templates/webapps/community/index.mako Thu Oct 13 16:09:28 2011 -0400 @@ -61,9 +61,11 @@ <a target="galaxy_main" href="${h.url_for( controller='repository', action='browse_repositories', operation='my_repositories', webapp='community' )}">Browse my repositories</a></div> %endif - <div class="toolTitle"> - <a target="galaxy_main" href="${h.url_for( controller='repository', action='find_tools', webapp='community' )}">Search for tools</a> - </div> + %if repository_metadata: + <div class="toolTitle"> + <a target="galaxy_main" href="${h.url_for( controller='repository', action='find_tools', webapp='community' )}">Search for valid tools</a> + </div> + %endif </div></div><div class="toolSectionBody">

--- a/templates/webapps/community/repository/find_tools.mako Thu Oct 13 15:35:45 2011 -0400 +++ b/templates/webapps/community/repository/find_tools.mako Thu Oct 13 16:09:28 2011 -0400 @@ -15,10 +15,10 @@ %endif

<div class="toolForm"> - <div class="toolFormTitle">Search repositories for tools</div> + <div class="toolFormTitle">Search repositories for valid tools</div><div class="toolFormBody"><div class="form-row"> - Enter any combination of the following tool attributes to locate matching tools. + Valid tools are those that properly load in Galaxy. Enter any combination of the following tool attributes to locate matching valid tools. </div><div style="clear: both"></div><form name="find_tools" id="find_tools" action="${h.url_for( controller='repository', action='find_tools' )}" method="post" >

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.