June 2011 - galaxy-commits - lists.galaxyproject.org

commit/galaxy-central: jgoecks: Disable grid controls and content when new content is being fetched. Fixes #272
by Bitbucket 08 Jun '11

08 Jun '11

1 new changeset in galaxy-central: http://bitbucket.org/galaxy/galaxy-central/changeset/c6b9d40bdd0e/ changeset: c6b9d40bdd0e user: jgoecks date: 2011-06-08 18:46:11 summary: Disable grid controls and content when new content is being fetched. Fixes #272 affected #: 1 file (8 bytes) --- a/templates/grid_base.mako Wed Jun 08 12:10:51 2011 -0400 +++ b/templates/grid_base.mako Wed Jun 08 12:46:11 2011 -0400 @@ -689,7 +689,7 @@ width : 100%; height : 100%; z-index : 14000; - position : absolute; + position : fixed; display: none; } ## If page is displayed in panels, pad from edges for readability. @@ -708,6 +708,7 @@ <%namespace file="./grid_common.mako" import="*" /><%def name="make_grid( grid )"> + <div class="loading-elt-overlay"></div><table><tr><td width="75%">${self.render_grid_header( grid )}</td> @@ -769,9 +770,7 @@ if show_item_checkboxes or multiple_item_ops_exist: show_item_checkboxes = True %> - <form action="${url()}" method="post" onsubmit="return false;"> - <div class="loading-elt-overlay"></div><table id="grid-table" class="grid"><thead id="grid-table-header"><tr> 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.

1 0

commit/galaxy-central: natefoo: Remove hardcoding of universe_wsgi.ini, fixes issue #358 (except for the sample cleanup scripts which, as samples, are expected to be modified by the site anyway).
by Bitbucket 08 Jun '11

08 Jun '11

1 new changeset in galaxy-central: http://bitbucket.org/galaxy/galaxy-central/changeset/73daddf1324d/ changeset: 73daddf1324d user: natefoo date: 2011-06-08 18:10:51 summary: Remove hardcoding of universe_wsgi.ini, fixes issue #358 (except for the sample cleanup scripts which, as samples, are expected to be modified by the site anyway). affected #: 10 files (2.6 KB) --- a/lib/galaxy/app.py Wed Jun 08 11:52:42 2011 -0400 +++ b/lib/galaxy/app.py Wed Jun 08 12:10:51 2011 -0400 @@ -29,7 +29,7 @@ db_url = "sqlite:///%s?isolation_level=IMMEDIATE" % self.config.database # Initialize database / check for appropriate schema version from galaxy.model.migrate.check import create_or_verify_database - create_or_verify_database( db_url, self.config.database_engine_options ) + create_or_verify_database( db_url, kwargs.get( 'global_conf', {} ).get( '__file__', None ), self.config.database_engine_options ) # Setup the database engine and ORM from galaxy.model import mapping self.model = mapping.init( self.config.file_path, --- a/lib/galaxy/eggs/__init__.py Wed Jun 08 11:52:42 2011 -0400 +++ b/lib/galaxy/eggs/__init__.py Wed Jun 08 12:10:51 2011 -0400 @@ -247,7 +247,7 @@ Reads the eggs.ini file for use with checking and fetching. """ config_file = os.path.join( galaxy_dir, 'eggs.ini' ) - def __init__( self, platform=None ): + def __init__( self, galaxy_config_file, platform=None ): self.eggs = {} self.config = CaseSensitiveConfigParser() self.repo = None @@ -256,7 +256,7 @@ self.py_platform = None if platform is not None: self.py_platform = platform.split( '-' )[0] - self.galaxy_config = GalaxyConfig() + self.galaxy_config = GalaxyConfig( galaxy_config_file ) self.parse() def parse( self ): self.config.read( Crate.config_file ) @@ -349,12 +349,14 @@ raise EggNotFetchable( missing ) class GalaxyConfig( object ): - config_file = os.path.join( galaxy_dir, "universe_wsgi.ini" ) always_conditional = ( 'GeneTrack', 'pysam', 'ctypes', 'python_daemon' ) - def __init__( self ): - self.config = ConfigParser.ConfigParser() - if self.config.read( GalaxyConfig.config_file ) == []: - raise Exception( "error: unable to read Galaxy config from %s" % GalaxyConfig.config_file ) + def __init__( self, config_file ): + if config_file is None: + self.config = None + else: + self.config = ConfigParser.ConfigParser() + if self.config.read( config_file ) == []: + raise Exception( "error: unable to read Galaxy config from %s" % config_file ) def check_conditional( self, egg_name ): def check_pysam(): # can't build pysam on solaris < 10 @@ -364,6 +366,10 @@ if int( minor ) < 10: return False return True + # If we're using require() we may not have a Galaxy config file, but if + # we're using require(), we don't care about conditionals. + if self.config is None: + return True if egg_name == "pysqlite": # SQLite is different since it can be specified in two config vars and defaults to True try: @@ -396,7 +402,7 @@ env = get_env() def require( req_str ): - c = Crate() + c = Crate( None ) req = pkg_resources.Requirement.parse( req_str ) # TODO: This breaks egg version requirements. Not currently a problem, but # it could become one. --- a/lib/galaxy/eggs/dist.py Wed Jun 08 11:52:42 2011 -0400 +++ b/lib/galaxy/eggs/dist.py Wed Jun 08 12:10:51 2011 -0400 @@ -39,10 +39,10 @@ Holds eggs with info on how to build them for distribution. """ dist_config_file = os.path.join( galaxy_dir, 'dist-eggs.ini' ) - def __init__( self, build_on='all' ): + def __init__( self, galaxy_config_file, build_on='all' ): self.dist_config = CaseSensitiveConfigParser() self.build_on = build_on - ScrambleCrate.__init__( self ) + ScrambleCrate.__init__( self, galaxy_config_file ) def parse( self ): self.dist_config.read( DistScrambleCrate.dist_config_file ) self.hosts = dict( self.dist_config.items( 'hosts' ) ) --- a/lib/galaxy/model/migrate/check.py Wed Jun 08 11:52:42 2011 -0400 +++ b/lib/galaxy/model/migrate/check.py Wed Jun 08 12:10:51 2011 -0400 @@ -20,7 +20,7 @@ "mysql" : "MySQL_python" } -def create_or_verify_database( url, engine_options={} ): +def create_or_verify_database( url, galaxy_config_file, engine_options={} ): """ Check that the database is use-able, possibly creating it if empty (this is the only time we automatically create tables, otherwise we force the @@ -98,8 +98,11 @@ # Verify that the code and the DB are in sync db_schema = schema.ControlledSchema( engine, migrate_repository ) if migrate_repository.versions.latest != db_schema.version: - raise Exception( "Your database has version '%d' but this code expects version '%d'. Please backup your database and then migrate the schema by running 'sh manage_db.sh upgrade'." - % ( db_schema.version, migrate_repository.versions.latest ) ) + config_arg = '' + if os.path.abspath( os.path.join( os.getcwd(), 'universe_wsgi.ini' ) ) != galaxy_config_file: + config_arg = ' -c %s' % galaxy_config_file.replace( os.path.abspath( os.getcwd() ), '.' ) + raise Exception( "Your database has version '%d' but this code expects version '%d'. Please backup your database and then migrate the schema by running 'sh manage_db.sh%s upgrade'." + % ( db_schema.version, migrate_repository.versions.latest, config_arg ) ) else: log.info( "At database version %d" % db_schema.version ) @@ -123,4 +126,4 @@ finally: for message in "".join( sys.stdout.buffer ).split( "\n" ): log.info( message ) - sys.stdout = old_stdout \ No newline at end of file + sys.stdout = old_stdout --- a/run.sh Wed Jun 08 11:52:42 2011 -0400 +++ b/run.sh Wed Jun 08 12:10:51 2011 -0400 @@ -32,7 +32,7 @@ [ "$arg" = "--stop-daemon" ] && FETCH_EGGS=0; break done if [ $FETCH_EGGS -eq 1 ]; then - python ./scripts/check_eggs.py quiet + python ./scripts/check_eggs.py -q if [ $? -ne 0 ]; then echo "Some eggs are out of date, attempting to fetch..." python ./scripts/fetch_eggs.py --- a/scripts/check_eggs.py Wed Jun 08 11:52:42 2011 -0400 +++ b/scripts/check_eggs.py Wed Jun 08 12:10:51 2011 -0400 @@ -3,27 +3,35 @@ usage: check_eggs.py """ import os, sys, logging +from optparse import OptionParser + +parser = OptionParser() +parser.add_option( '-c', '--config', dest='config', help='Path to Galaxy config file (universe_wsgi.ini)', default='universe_wsgi.ini' ) +parser.add_option( '-q', '--quiet', dest='quiet', action="store_true", help='Quiet (no output, only set return code)', default=False ) +( options, args ) = parser.parse_args() + +if not os.path.exists( options.config ): + print "Config file does not exist (see 'python %s --help'): %s" % ( sys.argv[0], options.config ) + sys.exit( 1 ) root = logging.getLogger() root.setLevel( 10 ) root.addHandler( logging.StreamHandler( sys.stdout ) ) +config_arg = '' +if options.config != 'universe_wsgi.ini': + config_arg = '-c %s' % options.config + lib = os.path.abspath( os.path.join( os.path.dirname( __file__ ), "..", "lib" ) ) sys.path.append( lib ) -try: - assert sys.argv[1] == 'quiet' - quiet = True -except: - quiet = False - from galaxy.eggs import Crate -c = Crate() +c = Crate( options.config ) if c.config_missing: - if not quiet: + if not options.quiet: print "Some of your Galaxy eggs are out of date. Please update them" print "by running:" - print " python scripts/fetch_eggs.py" + print " python scripts/fetch_eggs.py %s" % config_arg sys.exit( 1 ) sys.exit( 0 ) --- a/scripts/dist-scramble.py Wed Jun 08 11:52:42 2011 -0400 +++ b/scripts/dist-scramble.py Wed Jun 08 12:10:51 2011 -0400 @@ -1,11 +1,10 @@ -""" -usage: dist-scramble.py <egg_name> [platform] - egg_name - The egg to scramble (as defined in eggs.ini) - platform - The platform to scramble on (as defined in - dist-eggs.ini). Leave blank for all. - Platform-inspecific eggs ignore this argument. -""" import os, sys, logging +from optparse import OptionParser + +parser = OptionParser() +parser.add_option( '-e', '--egg-name', dest='egg_name', help='Egg name (as defined in eggs.ini) to scramble (required)' ) +parser.add_option( '-p', '--platform', dest='platform', help='Scramble for a specific platform (by default, eggs are scrambled for all platforms, see dist-eggs.ini for platform names)' ) +( options, args ) = parser.parse_args() root = logging.getLogger() root.setLevel( 10 ) @@ -17,18 +16,20 @@ from galaxy.eggs.dist import DistScrambleCrate, ScrambleFailure from galaxy.eggs import EggNotFetchable -if len( sys.argv ) > 3 or len( sys.argv ) < 2: - print __doc__ +if not options.egg_name: + print "ERROR: You must specify an egg to scramble (-e)" + parser.print_help() sys.exit( 1 ) -elif len( sys.argv ) == 3: - c = DistScrambleCrate( sys.argv[2] ) + +if options.platform: + c = DistScrambleCrate( None, options.platform ) else: - c = DistScrambleCrate() + c = DistScrambleCrate( None ) try: - eggs = c[sys.argv[1]] + eggs = c[options.egg_name] except: - print "error: %s not in eggs.ini" % sys.argv[1] + print "ERROR: %s not in eggs.ini" % options.egg_name sys.exit( 1 ) failed = [] for egg in eggs: --- a/scripts/fetch_eggs.py Wed Jun 08 11:52:42 2011 -0400 +++ b/scripts/fetch_eggs.py Wed Jun 08 12:10:51 2011 -0400 @@ -1,15 +1,15 @@ -""" -usage: fetch_eggs.py [egg_name] [platform] - With no arguments, fetches all eggs necessary according to the - settings in universe_wsgi.ini. - egg_name - Fetch only this egg (as defined in eggs.ini) or 'all' for - all eggs (even those not required by your settings). - platform - Fetch eggs for a specific platform (if not provided, fetch - eggs for *this* platform). Useful for fetching eggs for cluster - nodes which are of a different architecture than the head node. - Platform name can be determined with the get_platforms.py script. -""" import os, sys, logging +from optparse import OptionParser + +parser = OptionParser() +parser.add_option( '-c', '--config', dest='config', help='Path to Galaxy config file (universe_wsgi.ini)', default='universe_wsgi.ini' ) +parser.add_option( '-e', '--egg-name', dest='egg_name', help='Egg name (as defined in eggs.ini) to fetch, or "all" for all eggs, even those not needed by your configuration' ) +parser.add_option( '-p', '--platform', dest='platform', help='Fetch for a specific platform (by default, eggs are fetched for *this* platform' ) +( options, args ) = parser.parse_args() + +if not os.path.exists( options.config ): + print "Config file does not exist (see 'python %s --help'): %s" % ( sys.argv[0], options.config ) + sys.exit( 1 ) root = logging.getLogger() root.setLevel( 10 ) @@ -21,18 +21,18 @@ from galaxy.eggs import Crate, EggNotFetchable import pkg_resources +if options.platform: + c = Crate( options.config, platform = options.platform ) +else: + c = Crate( options.config ) try: - c = Crate( platform = sys.argv[2] ) -except: - c = Crate() -try: - if len( sys.argv ) == 1: + if not options.egg_name: c.resolve() # Only fetch eggs required by the config - elif sys.argv[1] == 'all': + elif options.egg_name == 'all': c.resolve( all=True ) # Fetch everything else: # Fetch a specific egg - name = sys.argv[1] + name = options.egg_name try: egg = c[name] except: @@ -41,12 +41,15 @@ dist = egg.resolve()[0] print "%s %s is installed at %s" % ( dist.project_name, dist.version, dist.location ) except EggNotFetchable, e: + config_arg = '' + if options.config != 'universe_wsgi.ini': + config_arg = '-c %s ' % options.config try: - assert sys.argv[1] != 'all' + assert options.egg_name != 'all' egg = e.eggs[0] print "%s %s couldn't be downloaded automatically. You can try" % ( egg.name, egg.version ) print "building it by hand with:" - print " python scripts/scramble.py %s" + print " python scripts/scramble.py %s-e %s" % ( config_arg, egg.name ) except ( AssertionError, IndexError ): print "One or more of the python eggs necessary to run Galaxy couldn't be" print "downloaded automatically. You can try building them by hand (all" @@ -54,6 +57,6 @@ print " python scripts/scramble.py" print "Or individually:" for egg in e.eggs: - print " python scripts/scramble.py %s" % egg.name + print " python scripts/scramble.py %s-e %s" % ( config_arg, egg.name ) sys.exit( 1 ) sys.exit( 0 ) --- a/scripts/manage_db.py Wed Jun 08 11:52:42 2011 -0400 +++ b/scripts/manage_db.py Wed Jun 08 12:10:51 2011 -0400 @@ -21,7 +21,15 @@ config_file = 'community_wsgi.ini' repo = 'lib/galaxy/webapps/community/model/migrate' else: + # Poor man's optparse config_file = 'universe_wsgi.ini' + if '-c' in sys.argv: + pos = sys.argv.index( '-c' ) + sys.argv.pop(pos) + config_file = sys.argv.pop( pos ) + if not os.path.exists( config_file ): + print "Galaxy config file does not exist (hint: use '-c config.ini' for non-standard locations): %s" % config_file + sys.exit( 1 ) repo = 'lib/galaxy/model/migrate' cp = SafeConfigParser() --- a/scripts/scramble.py Wed Jun 08 11:52:42 2011 -0400 +++ b/scripts/scramble.py Wed Jun 08 12:10:51 2011 -0400 @@ -1,11 +1,14 @@ -""" -usage: scramble.py [egg_name] - With no arguments, scrambles all eggs necessary according to the - settings in universe_wsgi.ini. - egg_name - Scramble only this egg (as defined in eggs.ini) or 'all' - for all eggs (even those not required by your settings). -""" import os, sys, logging +from optparse import OptionParser + +parser = OptionParser() +parser.add_option( '-c', '--config', dest='config', help='Path to Galaxy config file (universe_wsgi.ini)', default='universe_wsgi.ini' ) +parser.add_option( '-e', '--egg-name', dest='egg_name', help='Egg name (as defined in eggs.ini) to fetch, or "all" for all eggs, even those not needed by your configuration' ) +( options, args ) = parser.parse_args() + +if not os.path.exists( options.config ): + print "Config file does not exist (see 'python %s --help'): %s" % ( sys.argv[0], options.config ) + sys.exit( 1 ) root = logging.getLogger() root.setLevel( 10 ) @@ -16,22 +19,25 @@ from galaxy.eggs.scramble import ScrambleCrate, ScrambleFailure, EggNotFetchable -c = ScrambleCrate() +c = ScrambleCrate( options.config ) try: - if len( sys.argv ) == 1: + if not options.egg_name: eggs = c.scramble() - elif sys.argv[1] == 'all': + elif options.egg_name == 'all': c.scramble( all=True ) else: # Scramble a specific egg - name = sys.argv[1] + name = options.egg_name try: egg = c[name] except: print "error: %s not in eggs.ini" % name sys.exit( 1 ) for dependency in egg.dependencies: + config_arg = '' + if options.config != 'universe_wsgi.ini': + config_arg = '-c %s' % options.config print "Checking %s dependency: %s" % ( egg.name, dependency ) try: c[dependency].require() @@ -39,7 +45,7 @@ degg = e.eggs[0] print "%s build dependency %s %s couldn't be downloaded" % ( egg.name, degg.name, degg.version ) print "automatically. You can try building it by hand with:" - print " python scripts/scramble.py %s" % degg.name + print " python scripts/scramble.py %s-e %s" % ( config_agr, degg.name ) sys.exit( 1 ) egg.scramble() sys.exit( 0 ) 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.

1 0

commit/galaxy-central: jgoecks: Unicode fixes and refactoring.
by Bitbucket 08 Jun '11

08 Jun '11

1 new changeset in galaxy-central: http://bitbucket.org/galaxy/galaxy-central/changeset/6005fbf6fc4d/ changeset: 6005fbf6fc4d user: jgoecks date: 2011-06-08 17:32:55 summary: Unicode fixes and refactoring. affected #: 3 files (231 bytes) --- a/lib/galaxy/tools/search/__init__.py Wed Jun 08 11:15:42 2011 -0400 +++ b/lib/galaxy/tools/search/__init__.py Wed Jun 08 11:32:55 2011 -0400 @@ -1,4 +1,5 @@ from galaxy.eggs import require +from galaxy.web.framework.helpers import to_unicode # Whoosh is compatible with Python 2.5+ Try to import Whoosh and set flag to indicate whether tool search is enabled. try: require( "Whoosh" ) @@ -35,12 +36,6 @@ writer = self.index.writer() ## TODO: would also be nice to search section headers. for id, tool in self.toolbox.tools_by_id.iteritems(): - def to_unicode( a_basestr ): - if type( a_basestr ) is str: - return unicode( a_basestr, 'utf-8' ) - else: - return a_basestr - writer.add_document( id=id, title=to_unicode(tool.name), description=to_unicode(tool.description), help=to_unicode(tool.help) ) writer.commit() --- a/lib/galaxy/web/controllers/root.py Wed Jun 08 11:15:42 2011 -0400 +++ b/lib/galaxy/web/controllers/root.py Wed Jun 08 11:32:55 2011 -0400 @@ -8,6 +8,7 @@ from galaxy.util.sanitize_html import sanitize_html from galaxy.model.orm import * from galaxy.model.item_attrs import UsesAnnotations +from galaxy.web.framework.helpers import to_unicode log = logging.getLogger( __name__ ) @@ -329,7 +330,7 @@ trans.sa_session.flush() if trans.app.config.set_metadata_externally: trans.app.datatypes_registry.set_external_metadata_tool.tool_action.execute( trans.app.datatypes_registry.set_external_metadata_tool, trans, incoming = { 'input1':data }, overwrite = False ) #overwrite is False as per existing behavior - return trans.show_ok_message( "Changed the type of dataset '%s' to %s" % ( data.name, params.datatype ), refresh_frames=['history'] ) + return trans.show_ok_message( "Changed the type of dataset '%s' to %s" % ( to_unicode( data.name ), params.datatype ), refresh_frames=['history'] ) else: return trans.show_error_message( "You are unable to change datatypes in this manner. Changing %s to %s is not allowed." % ( data.extension, params.datatype ) ) elif params.save: --- a/templates/dataset/copy_view.mako Wed Jun 08 11:15:42 2011 -0400 +++ b/templates/dataset/copy_view.mako Wed Jun 08 11:32:55 2011 -0400 @@ -66,7 +66,7 @@ %><div class="form-row"><input type="checkbox" name="source_dataset_ids" id="dataset_${encoded_id}" value="${encoded_id}"${checked}/> - <label for="dataset_${encoded_id}" style="display: inline;font-weight:normal;"> ${data.hid}: ${data.name}</label> + <label for="dataset_${encoded_id}" style="display: inline;font-weight:normal;"> ${data.hid}: ${h.to_unicode(data.name)}</label></div> %endfor %else: 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.

1 0

commit/galaxy-central: afgane: Do not display non-functional buttons for editing tags/annotations on history Show Structure page
by Bitbucket 08 Jun '11

08 Jun '11

1 new changeset in galaxy-central: http://bitbucket.org/galaxy/galaxy-central/changeset/5b5f693ca5cb/ changeset: 5b5f693ca5cb user: afgane date: 2011-06-08 17:15:42 summary: Do not display non-functional buttons for editing tags/annotations on history Show Structure page affected #: 2 files (106 bytes) --- a/templates/history/display_structured.mako Tue Jun 07 14:53:53 2011 -0400 +++ b/templates/history/display_structured.mako Wed Jun 08 11:15:42 2011 -0400 @@ -91,7 +91,7 @@ </%def><%def name="render_item_hda( hda, children )"> - ${render_dataset( hda, hda.hid )} + ${render_dataset( hda, hda.hid, display_structured=True )} </%def><%def name="render_item_job( job, children )"> --- a/templates/root/history_common.mako Tue Jun 07 14:53:53 2011 -0400 +++ b/templates/root/history_common.mako Wed Jun 08 11:15:42 2011 -0400 @@ -1,6 +1,6 @@ <% _=n_ %> ## Render the dataset `data` as history item, using `hid` as the displayed id -<%def name="render_dataset( data, hid, show_deleted_on_refresh = False, for_editing = True )"> +<%def name="render_dataset( data, hid, show_deleted_on_refresh = False, for_editing = True, display_structured = False )"><% dataset_id = trans.security.encode_id( data.id ) from galaxy.datatypes.metadata import FileParameter @@ -171,10 +171,12 @@ new-url="${h.url_for( controller='tracks', action='index', dataset_id=dataset_id, default_dbkey=data.dbkey)}" title="Visualize in Trackster"></a> %endif %if trans.user: - <div style="float: right"> - <a href="${h.url_for( controller='tag', action='retag', item_class=data.__class__.__name__, item_id=dataset_id )}" target="galaxy_main" title="Edit dataset tags" class="icon-button tags tooltip"></a> - <a href="${h.url_for( controller='dataset', action='annotate', id=dataset_id )}" target="galaxy_main" title="Edit dataset annotation" class="icon-button annotate tooltip"></a> - </div> + %if not display_structured: + <div style="float: right"> + <a href="${h.url_for( controller='tag', action='retag', item_class=data.__class__.__name__, item_id=dataset_id )}" target="galaxy_main" title="Edit dataset tags" class="icon-button tags tooltip"></a> + <a href="${h.url_for( controller='dataset', action='annotate', id=dataset_id )}" target="galaxy_main" title="Edit dataset annotation" class="icon-button annotate tooltip"></a> + </div> + %endif <div style="clear: both"></div><div class="tag-area" style="display: none"><strong>Tags:</strong> 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.

1 0

commit/galaxy-central: greg: Revert change set 2b4d50205705, adding a [missing] comment so all meta data items will always be displayed on the ldda_info page.
by Bitbucket 07 Jun '11

07 Jun '11

1 new changeset in galaxy-central: http://bitbucket.org/galaxy/galaxy-central/changeset/515151397bc5/ changeset: 515151397bc5 user: greg date: 2011-06-07 20:53:53 summary: Revert change set 2b4d50205705, adding a [missing] comment so all meta data items will always be displayed on the ldda_info page. affected #: 1 file (12 bytes) --- a/templates/library/common/ldda_info.mako Tue Jun 07 14:36:46 2011 -0400 +++ b/templates/library/common/ldda_info.mako Tue Jun 07 14:53:53 2011 -0400 @@ -135,23 +135,22 @@ <div class="form-row"><div>${ldda.blurb}</div></div> + ## We want to display all metadata item here, whether marked visible or not since they are all pretty useful %for name, spec in ldda.metadata.spec.items(): - %if spec.visible: - <div class="form-row"> - <label>${spec.desc.replace( ' (click box & select)', '' )}:</label> - <% - metadata_val = ldda.metadata.get( name ) - if isinstance( metadata_val, trans.model.MetadataFile ): - metadata_val = metadata_val.file_name - elif isinstance( metadata_val, list ): - # Make sure list items are strings - metadata_val = [ str( item ) for item in metadata_val ] - metadata_val = ', '.join( metadata_val ) - %> - ${metadata_val} - <div style="clear: both"></div> - </div> - %endif + <div class="form-row"> + <label>${spec.desc.replace( ' (click box & select)', '' )}:</label> + <% + metadata_val = ldda.metadata.get( name ) + if isinstance( metadata_val, trans.model.MetadataFile ): + metadata_val = metadata_val.file_name + elif isinstance( metadata_val, list ): + # Make sure list items are strings + metadata_val = [ str( item ) for item in metadata_val ] + metadata_val = ', '.join( metadata_val ) + %> + ${metadata_val} + <div style="clear: both"></div> + </div> %endfor %if ldda.peek != "no peek": <div class="form-row"> 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.

1 0

commit/galaxy-central: richard_burhans: allow lines starting with arbitrary characters to be excluded from the peek
by Bitbucket 07 Jun '11

07 Jun '11

1 new changeset in galaxy-central: http://bitbucket.org/galaxy/galaxy-central/changeset/bcc9c7aa5569/ changeset: bcc9c7aa5569 user: richard_burhans date: 2011-06-07 20:36:46 summary: allow lines starting with arbitrary characters to be excluded from the peek affected #: 1 file (243 bytes) --- a/lib/galaxy/datatypes/data.py Tue Jun 07 14:31:58 2011 -0400 +++ b/lib/galaxy/datatypes/data.py Tue Jun 07 14:36:46 2011 -0400 @@ -417,13 +417,13 @@ if line and not line.startswith( '#' ): data_lines += 1 return data_lines - def set_peek( self, dataset, line_count=None, is_multi_byte=False ): + def set_peek( self, dataset, line_count=None, is_multi_byte=False, skipchars=[] ): """ Set the peek. This method is used by various subclasses of Text. """ if not dataset.dataset.purged: # The file must exist on disk for the get_file_peek() method - dataset.peek = get_file_peek( dataset.file_name, is_multi_byte=is_multi_byte ) + dataset.peek = get_file_peek( dataset.file_name, is_multi_byte=is_multi_byte, skipchars=skipchars ) if line_count is None: # See if line_count is stored in the metadata if dataset.metadata.data_lines: @@ -461,7 +461,7 @@ path, name = os.path.split(__file__) full_path = os.path.join( path, 'test', fname ) return full_path -def get_file_peek( file_name, is_multi_byte=False, WIDTH=256, LINE_COUNT=5 ): +def get_file_peek( file_name, is_multi_byte=False, WIDTH=256, LINE_COUNT=5, skipchars=[] ): """ Returns the first LINE_COUNT lines wrapped to WIDTH @@ -489,8 +489,14 @@ data_checked = True if file_type in [ 'gzipped', 'binary' ]: break - lines.append( line ) - count += 1 + skip_line = False + for skipchar in skipchars: + if line.startswith( skipchar ): + skip_line = True + break + if not skip_line: + lines.append( line ) + count += 1 temp.close() if file_type in [ 'gzipped', 'binary' ]: text = "%s file" % file_type 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.

1 0

commit/galaxy-central: 2 new changesets
by Bitbucket 07 Jun '11

07 Jun '11

2 new changesets in galaxy-central: http://bitbucket.org/galaxy/galaxy-central/changeset/dc97d0a852cb/ changeset: dc97d0a852cb user: jgoecks date: 2011-06-07 20:31:35 summary: Rename and reorder Cuffdiff outputs for clarity. affected #: 1 file (172 bytes) --- a/tools/ngs_rna/cuffdiff_wrapper.xml Tue Jun 07 11:32:11 2011 -0400 +++ b/tools/ngs_rna/cuffdiff_wrapper.xml Tue Jun 07 14:31:35 2011 -0400 @@ -132,17 +132,17 @@ </inputs><outputs> - <data format="tabular" name="isoforms_exp" label="${tool.name} on ${on_string}: isoform expression"/> - <data format="tabular" name="genes_exp" label="${tool.name} on ${on_string}: gene expression"/> - <data format="tabular" name="tss_groups_exp" label="${tool.name} on ${on_string}: TSS groups expression"/> - <data format="tabular" name="cds_exp_fpkm_tracking" label="${tool.name} on ${on_string}: CDS Expression FPKM Tracking"/> - <data format="tabular" name="isoforms_fpkm_tracking" label="${tool.name} on ${on_string}: isoform FPKM tracking"/> + <data format="tabular" name="splicing_diff" label="${tool.name} on ${on_string}: splicing differential expression testing"/> + <data format="tabular" name="promoters_diff" label="${tool.name} on ${on_string}: promoters differential expression testing"/> + <data format="tabular" name="cds_diff" label="${tool.name} on ${on_string}: CDS overloading diffential expression testing"/> + <data format="tabular" name="cds_exp_fpkm_tracking" label="${tool.name} on ${on_string}: CDS FPKM differential expression testing"/> + <data format="tabular" name="cds_fpkm_tracking" label="${tool.name} on ${on_string}: CDS FPKM tracking"/> + <data format="tabular" name="tss_groups_exp" label="${tool.name} on ${on_string}: TSS groups differential expression testing"/> + <data format="tabular" name="tss_groups_fpkm_tracking" label="${tool.name} on ${on_string}: TSS groups FPKM tracking" /> + <data format="tabular" name="genes_exp" label="${tool.name} on ${on_string}: gene differential expression testing"/><data format="tabular" name="genes_fpkm_tracking" label="${tool.name} on ${on_string}: gene FPKM tracking"/> - <data format="tabular" name="tss_groups_fpkm_tracking" label="${tool.name} on ${on_string}: TSS groups FPKM tracking" /> - <data format="tabular" name="cds_fpkm_tracking" label="${tool.name} on ${on_string}: CDS FPKM tracking"/> - <data format="tabular" name="splicing_diff" label="${tool.name} on ${on_string}: splicing diff"/> - <data format="tabular" name="promoters_diff" label="${tool.name} on ${on_string}: promoters diff"/> - <data format="tabular" name="cds_diff" label="${tool.name} on ${on_string}: CDS diff"/> + <data format="tabular" name="isoforms_exp" label="${tool.name} on ${on_string}: transcript differential expression testing"/> + <data format="tabular" name="isoforms_fpkm_tracking" label="${tool.name} on ${on_string}: transcript FPKM tracking"/></outputs><tests> @@ -164,17 +164,17 @@ Line diffs are needed because cuffdiff does not produce deterministic output. TODO: can we find datasets that lead to deterministic behavior? --> - <output name="isoforms_exp" file="cuffdiff_out1.txt" lines_diff="200"/> - <output name="genes_exp" file="cuffdiff_out2.txt" lines_diff="200"/> - <output name="tss_groups_exp" file="cuffdiff_out3.txt"/> - <output name="cds_exp_fpkm_tracking" file="cuffdiff_out4.txt"/> - <output name="isoforms_fpkm_tracking" file="cuffdiff_out5.txt" lines_diff="200"/> - <output name="genes_fpkm_tracking" file="cuffdiff_out6.txt" lines_diff="200"/> - <output name="tss_groups_fpkm_tracking" file="cuffdiff_out7.txt"/> - <output name="cds_fpkm_tracking" file="cuffdiff_out8.txt"/><output name="splicing_diff" file="cuffdiff_out9.txt"/><output name="promoters_diff" file="cuffdiff_out10.txt"/><output name="cds_diff" file="cuffdiff_out11.txt"/> + <output name="cds_exp_fpkm_tracking" file="cuffdiff_out4.txt"/> + <output name="cds_fpkm_tracking" file="cuffdiff_out8.txt"/> + <output name="tss_groups_exp" file="cuffdiff_out3.txt"/> + <output name="tss_groups_fpkm_tracking" file="cuffdiff_out7.txt"/> + <output name="genes_exp" file="cuffdiff_out2.txt" lines_diff="200"/> + <output name="genes_fpkm_tracking" file="cuffdiff_out6.txt" lines_diff="200"/> + <output name="isoforms_exp" file="cuffdiff_out1.txt" lines_diff="200"/> + <output name="isoforms_fpkm_tracking" file="cuffdiff_out5.txt" lines_diff="200"/></test></tests> http://bitbucket.org/galaxy/galaxy-central/changeset/801a4a2a5921/ changeset: 801a4a2a5921 user: jgoecks date: 2011-06-07 20:31:58 summary: Merge. affected #: 1 file (105 bytes) --- a/templates/library/common/ldda_info.mako Tue Jun 07 14:31:35 2011 -0400 +++ b/templates/library/common/ldda_info.mako Tue Jun 07 14:31:58 2011 -0400 @@ -136,20 +136,22 @@ <div>${ldda.blurb}</div></div> %for name, spec in ldda.metadata.spec.items(): - <div class="form-row"> - <label>${spec.desc.replace( ' (click box & select)', '' )}:</label> - <% - metadata_val = ldda.metadata.get( name ) - if isinstance( metadata_val, trans.model.MetadataFile ): - metadata_val = metadata_val.file_name - elif isinstance( metadata_val, list ): - # Make sure list items are strings - metadata_val = [ str( item ) for item in metadata_val ] - metadata_val = ', '.join( metadata_val ) - %> - ${metadata_val} - <div style="clear: both"></div> - </div> + %if spec.visible: + <div class="form-row"> + <label>${spec.desc.replace( ' (click box & select)', '' )}:</label> + <% + metadata_val = ldda.metadata.get( name ) + if isinstance( metadata_val, trans.model.MetadataFile ): + metadata_val = metadata_val.file_name + elif isinstance( metadata_val, list ): + # Make sure list items are strings + metadata_val = [ str( item ) for item in metadata_val ] + metadata_val = ', '.join( metadata_val ) + %> + ${metadata_val} + <div style="clear: both"></div> + </div> + %endif %endfor %if ldda.peek != "no peek": <div class="form-row"> 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.

1 0

commit/galaxy-central: richard_burhans: don't show metadata items that are not visible
by Bitbucket 07 Jun '11

07 Jun '11

1 new changeset in galaxy-central: http://bitbucket.org/galaxy/galaxy-central/changeset/2b4d50205705/ changeset: 2b4d50205705 user: richard_burhans date: 2011-06-07 20:30:52 summary: don't show metadata items that are not visible affected #: 1 file (105 bytes) --- a/templates/library/common/ldda_info.mako Tue Jun 07 11:32:11 2011 -0400 +++ b/templates/library/common/ldda_info.mako Tue Jun 07 14:30:52 2011 -0400 @@ -136,20 +136,22 @@ <div>${ldda.blurb}</div></div> %for name, spec in ldda.metadata.spec.items(): - <div class="form-row"> - <label>${spec.desc.replace( ' (click box & select)', '' )}:</label> - <% - metadata_val = ldda.metadata.get( name ) - if isinstance( metadata_val, trans.model.MetadataFile ): - metadata_val = metadata_val.file_name - elif isinstance( metadata_val, list ): - # Make sure list items are strings - metadata_val = [ str( item ) for item in metadata_val ] - metadata_val = ', '.join( metadata_val ) - %> - ${metadata_val} - <div style="clear: both"></div> - </div> + %if spec.visible: + <div class="form-row"> + <label>${spec.desc.replace( ' (click box & select)', '' )}:</label> + <% + metadata_val = ldda.metadata.get( name ) + if isinstance( metadata_val, trans.model.MetadataFile ): + metadata_val = metadata_val.file_name + elif isinstance( metadata_val, list ): + # Make sure list items are strings + metadata_val = [ str( item ) for item in metadata_val ] + metadata_val = ', '.join( metadata_val ) + %> + ${metadata_val} + <div style="clear: both"></div> + </div> + %endif %endfor %if ldda.peek != "no peek": <div class="form-row"> 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.

1 0

commit/galaxy-central: greg: Commit versions of tools from the last_gen tool shed in order of oldest -> newest in the next-gen tool shed. Fixes issue # 578.
by Bitbucket 07 Jun '11

07 Jun '11

1 new changeset in galaxy-central: http://bitbucket.org/galaxy/galaxy-central/changeset/063ac2ef7a5e/ changeset: 063ac2ef7a5e branches: user: greg date: 2011-06-07 17:32:11 summary: Commit versions of tools from the last_gen tool shed in order of oldest -> newest in the next-gen tool shed. Fixes issue # 578. affected #: 1 file (0 bytes) --- a/scripts/tool_shed/migrate_tools_to_repositories.py Tue Jun 07 11:06:50 2011 -0400 +++ b/scripts/tool_shed/migrate_tools_to_repositories.py Tue Jun 07 11:32:11 2011 -0400 @@ -59,12 +59,12 @@ this_item = item while item.newer_version: if item.newer_version.state in valid_states: - versions.insert( 0, item.newer_version ) + versions.append( item.newer_version ) item = item.newer_version item = this_item while item.older_version: if item.older_version[ 0 ].state in valid_states: - versions.append( item.older_version[ 0 ] ) + versions.insert( 0, item.older_version[ 0 ] ) item = item.older_version[ 0 ] return versions 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.

1 0

commit/galaxy-central: greg: Add the ability to download repository files in tar.gz, tar.bz2 or zip format from the tool shed.
by Bitbucket 07 Jun '11

07 Jun '11

1 new changeset in galaxy-central: http://bitbucket.org/galaxy/galaxy-central/changeset/1119959f40cc/ changeset: 1119959f40cc branches: user: greg date: 2011-06-07 17:06:50 summary: Add the ability to download repository files in tar.gz, tar.bz2 or zip format from the tool shed. affected #: 8 files (4.6 KB) --- a/lib/galaxy/webapps/community/controllers/repository.py Tue Jun 07 10:46:52 2011 -0400 +++ b/lib/galaxy/webapps/community/controllers/repository.py Tue Jun 07 11:06:50 2011 -0400 @@ -611,6 +611,23 @@ rra=rra, message=message, status=status ) + @web.expose + def download( self, trans, repository_id, file_type, **kwd ): + # Download an archive of the repository files compressed as zip, gz or bz2. + params = util.Params( kwd ) + repository = get_repository( trans, repository_id ) + # Allow hgweb to handle the download. This requires the tool shed + # server account's .hgrc file to include the following setting: + # [web] + # allow_archive = bz2, gz, zip + if file_type == 'zip': + file_type_str = 'tip.zip' + elif file_type == 'bz2': + file_type_str = 'tip.tar.bz2' + elif file_type == 'gz': + file_type_str = 'tip.tar.gz' + download_url = '/repos/%s/%s/archive/%s' % ( repository.user.username, repository.name, file_type_str ) + return trans.response.send_redirect( download_url ) @web.json def open_folder( self, trans, repository_id, key ): # TODO: The tool shed includes a repository source file browser, which currently depends upon --- a/lib/galaxy/webapps/community/controllers/upload.py Tue Jun 07 10:46:52 2011 -0400 +++ b/lib/galaxy/webapps/community/controllers/upload.py Tue Jun 07 11:06:50 2011 -0400 @@ -119,11 +119,12 @@ repo.dirstate.add( file_path ) files_to_commit.append( file_path ) else: - # We're uploading files to a repository with existing - # contents, so clone the repository to a temporary location. - tmp_dir, cloned_repo_dir = self.__handle_hg_clone( trans, repository, upload_point, uploaded_file, file_data, repo_dir, current_working_dir, istar, tar=tar ) + # Clone the repository to a temporary location. + tmp_dir, cloned_repo_dir = self.__hg_clone( trans, repository, repo_dir, current_working_dir ) + # Move the uploaded files to the upload_point within the cloned repository. + self.__move_to_upload_point( upload_point, uploaded_file, file_data, cloned_repo_dir, istar, tar ) # Commit and push the changes from the cloned repo to the master repo. - self.__handle_hg_push( trans, repository, file_data, commit_message, current_working_dir, cloned_repo_dir, repo_dir, tmp_dir ) + self.__hg_push( trans, repository, file_data, commit_message, current_working_dir, cloned_repo_dir, repo_dir, tmp_dir ) if ok: if files_to_commit: repo.dirstate.write() @@ -147,7 +148,7 @@ commit_message=commit_message, message=message, status=status ) - def __handle_hg_clone( self, trans, repository, upload_point, uploaded_file, file_data, repo_dir, current_working_dir, istar, tar=None ): + def __hg_clone( self, trans, repository, repo_dir, current_working_dir ): tmp_dir = tempfile.mkdtemp() tmp_archive_dir = os.path.join( tmp_dir, 'tmp_archive_dir' ) if not os.path.exists( tmp_archive_dir ): @@ -158,20 +159,8 @@ os.system( cmd ) os.chdir( current_working_dir ) cloned_repo_dir = os.path.join( tmp_archive_dir, 'repo_%d' % repository.id ) - if upload_point is not None: - full_path = os.path.abspath( os.path.join( cloned_repo_dir, upload_point, file_data.filename ) ) - else: - full_path = os.path.abspath( os.path.join( cloned_repo_dir, file_data.filename ) ) - if istar: - # Extract the uploaded tarball to the load_point within the cloned repository hierarchy - tar.extractall( path=full_path ) - tar.close() - uploaded_file.close() - else: - # Move the uploaded file to the load_point within the cloned repository hierarchy - shutil.move( uploaded_file.name, full_path ) return tmp_dir, cloned_repo_dir - def __handle_hg_push( self, trans, repository, file_data, commit_message, current_working_dir, cloned_repo_dir, repo_dir, tmp_dir ): + def __hg_push( self, trans, repository, file_data, commit_message, current_working_dir, cloned_repo_dir, repo_dir, tmp_dir ): # We want these change sets to be associated with the owner of the repository, so we'll # set the HGUSER environment variable accordingly. os.environ[ 'HGUSER' ] = trans.user.username @@ -198,6 +187,19 @@ action='browse_repository', message=message, id=trans.security.encode_id( repository.id ) ) ) + def __move_to_upload_point( self, upload_point, uploaded_file, file_data, cloned_repo_dir, istar, tar ): + if upload_point is not None: + full_path = os.path.abspath( os.path.join( cloned_repo_dir, upload_point, file_data.filename ) ) + else: + full_path = os.path.abspath( os.path.join( cloned_repo_dir, file_data.filename ) ) + if istar: + # Extract the uploaded tarball to the load_point within the cloned repository hierarchy + tar.extractall( path=full_path ) + tar.close() + uploaded_file.close() + else: + # Move the uploaded file to the load_point within the cloned repository hierarchy + shutil.move( uploaded_file.name, full_path ) def __check_archive( self, archive ): for member in archive.getmembers(): # Allow regular files and directories only --- a/templates/webapps/community/repository/browse_repository.mako Tue Jun 07 10:46:52 2011 -0400 +++ b/templates/webapps/community/repository/browse_repository.mako Tue Jun 07 11:06:50 2011 -0400 @@ -79,6 +79,9 @@ %if can_rate: <a class="action-button" href="${h.url_for( controller='repository', action='rate_repository', id=trans.app.security.encode_id( repository.id ) )}">Rate repository</a> %endif + <a class="action-button" href="${h.url_for( controller='repository', action='download', repository_id=trans.app.security.encode_id( repository.id ), file_type='gz' )}">Download as a .tar.gz file</a> + <a class="action-button" href="${h.url_for( controller='repository', action='download', repository_id=trans.app.security.encode_id( repository.id ), file_type='bz2' )}">Download as a .tar.bz2 file</a> + <a class="action-button" href="${h.url_for( controller='repository', action='download', repository_id=trans.app.security.encode_id( repository.id ), file_type='zip' )}">Download as a zip file</a></div> %endif </ul> --- a/templates/webapps/community/repository/manage_repository.mako Tue Jun 07 10:46:52 2011 -0400 +++ b/templates/webapps/community/repository/manage_repository.mako Tue Jun 07 11:06:50 2011 -0400 @@ -76,6 +76,9 @@ %if can_browse_contents: <a class="action-button" href="${h.url_for( controller='repository', action='browse_repository', id=trans.app.security.encode_id( repository.id ) )}">Browse repository</a> %endif + <a class="action-button" href="${h.url_for( controller='repository', action='download', repository_id=trans.app.security.encode_id( repository.id ), file_type='gz' )}">Download as a .tar.gz file</a> + <a class="action-button" href="${h.url_for( controller='repository', action='download', repository_id=trans.app.security.encode_id( repository.id ), file_type='bz2' )}">Download as a .tar.bz2 file</a> + <a class="action-button" href="${h.url_for( controller='repository', action='download', repository_id=trans.app.security.encode_id( repository.id ), file_type='zip' )}">Download as a zip file</a></div> %endif </ul> --- a/templates/webapps/community/repository/rate_repository.mako Tue Jun 07 10:46:52 2011 -0400 +++ b/templates/webapps/community/repository/rate_repository.mako Tue Jun 07 11:06:50 2011 -0400 @@ -81,6 +81,9 @@ %if can_browse_contents: <a class="action-button" href="${h.url_for( controller='repository', action='browse_repository', id=trans.app.security.encode_id( repository.id ) )}">Browse repository</a> %endif + <a class="action-button" href="${h.url_for( controller='repository', action='download', repository_id=trans.app.security.encode_id( repository.id ), file_type='gz' )}">Download as a .tar.gz file</a> + <a class="action-button" href="${h.url_for( controller='repository', action='download', repository_id=trans.app.security.encode_id( repository.id ), file_type='bz2' )}">Download as a .tar.bz2 file</a> + <a class="action-button" href="${h.url_for( controller='repository', action='download', repository_id=trans.app.security.encode_id( repository.id ), file_type='zip' )}">Download as a zip file</a></div> %endif </ul> --- a/templates/webapps/community/repository/view_changelog.mako Tue Jun 07 10:46:52 2011 -0400 +++ b/templates/webapps/community/repository/view_changelog.mako Tue Jun 07 11:06:50 2011 -0400 @@ -50,6 +50,9 @@ %if can_browse_contents: <a class="action-button" href="${h.url_for( controller='repository', action='browse_repository', id=trans.app.security.encode_id( repository.id ) )}">Browse repository</a> %endif + <a class="action-button" href="${h.url_for( controller='repository', action='download', repository_id=trans.app.security.encode_id( repository.id ), file_type='gz' )}">Download as a .tar.gz file</a> + <a class="action-button" href="${h.url_for( controller='repository', action='download', repository_id=trans.app.security.encode_id( repository.id ), file_type='bz2' )}">Download as a .tar.bz2 file</a> + <a class="action-button" href="${h.url_for( controller='repository', action='download', repository_id=trans.app.security.encode_id( repository.id ), file_type='zip' )}">Download as a zip file</a></div></ul> --- a/templates/webapps/community/repository/view_changeset.mako Tue Jun 07 10:46:52 2011 -0400 +++ b/templates/webapps/community/repository/view_changeset.mako Tue Jun 07 11:06:50 2011 -0400 @@ -54,6 +54,9 @@ %if can_browse_contents: <a class="action-button" href="${h.url_for( controller='repository', action='browse_repository', id=trans.app.security.encode_id( repository.id ) )}">Browse repository</a> %endif + <a class="action-button" href="${h.url_for( controller='repository', action='download', repository_id=trans.app.security.encode_id( repository.id ), file_type='gz' )}">Download as a .tar.gz file</a> + <a class="action-button" href="${h.url_for( controller='repository', action='download', repository_id=trans.app.security.encode_id( repository.id ), file_type='bz2' )}">Download as a .tar.bz2 file</a> + <a class="action-button" href="${h.url_for( controller='repository', action='download', repository_id=trans.app.security.encode_id( repository.id ), file_type='zip' )}">Download as a zip file</a></div></ul> --- a/templates/webapps/community/repository/view_repository.mako Tue Jun 07 10:46:52 2011 -0400 +++ b/templates/webapps/community/repository/view_repository.mako Tue Jun 07 11:06:50 2011 -0400 @@ -76,6 +76,9 @@ %if can_browse_contents: <a class="action-button" href="${h.url_for( controller='repository', action='browse_repository', id=trans.app.security.encode_id( repository.id ) )}">Browse repository</a> %endif + <a class="action-button" href="${h.url_for( controller='repository', action='download', repository_id=trans.app.security.encode_id( repository.id ), file_type='gz' )}">Download as a .tar.gz file</a> + <a class="action-button" href="${h.url_for( controller='repository', action='download', repository_id=trans.app.security.encode_id( repository.id ), file_type='bz2' )}">Download as a .tar.bz2 file</a> + <a class="action-button" href="${h.url_for( controller='repository', action='download', repository_id=trans.app.security.encode_id( repository.id ), file_type='zip' )}">Download as a zip file</a></div> %endif </ul> 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.

1 0