2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/c04ab20c6ee2/ changeset: c04ab20c6ee2 user: dan date: 2012-06-25 21:53:57 summary: Fix for getting mime type of converted datasets when not specified explicitly for external display applications. affected #: 1 file diff -r 20e01e610de056e2f2855df9a3840c315b17587f -r c04ab20c6ee25af93a8aedc529a6689e8d64e8b2 lib/galaxy/datatypes/display_applications/parameters.py --- a/lib/galaxy/datatypes/display_applications/parameters.py +++ b/lib/galaxy/datatypes/display_applications/parameters.py @@ -195,6 +195,8 @@ mime = self.trans.app.datatypes_registry.get_mimetype_by_extension( ".".split( self._url )[ -1 ], None ) if mime: return mime + if hasattr( self.value, 'get_mime' ): + return self.value.get_mime() return self.other_values[ DEFAULT_DATASET_NAME ].get_mime() @property def action_name( self ): https://bitbucket.org/galaxy/galaxy-central/changeset/319b2b0e832c/ changeset: 319b2b0e832c user: dan date: 2012-06-25 21:54:27 summary: Add name parameter to IGV external display applications. affected #: 2 files diff -r c04ab20c6ee25af93a8aedc529a6689e8d64e8b2 -r 319b2b0e832c8ea5ef520c76722f7ad6270507c3 display_applications/igv/bam.xml --- a/display_applications/igv/bam.xml +++ b/display_applications/igv/bam.xml @@ -81,9 +81,9 @@ </param><param type="template" name="redirect_url" strip="True" > #if $site_id.startswith( 'local_' ) - ${site_link}?file=${bam_file.qp}&genome=${site_organism}&merge=true + ${site_link}?file=${bam_file.qp}&genome=${site_organism}&merge=true&name=${qp( $bam_file.name )} #elif $site_id.startswith( 'web_link_' ): - ${site_link}?sessionURL=${bam_file.qp}&genome=${site_organism}&merge=true + ${site_link}?sessionURL=${bam_file.qp}&genome=${site_organism}&merge=true&name=${qp( $bam_file.name )} #else: ${jnlp.url} #end if diff -r c04ab20c6ee25af93a8aedc529a6689e8d64e8b2 -r 319b2b0e832c8ea5ef520c76722f7ad6270507c3 display_applications/igv/vcf.xml --- a/display_applications/igv/vcf.xml +++ b/display_applications/igv/vcf.xml @@ -81,9 +81,9 @@ </param><param type="template" name="redirect_url" strip="True" > #if $site_id.startswith( 'local_' ) - ${site_link}?file=${bgzip_file.qp}&genome=${site_organism}&merge=true + ${site_link}?file=${bgzip_file.qp}&genome=${site_organism}&merge=true&name=${qp( $bgzip_file.name )} #elif $site_id.startswith( 'web_link_' ): - ${site_link}?sessionURL=${bgzip_file.qp}&genome=${site_organism}&merge=true + ${site_link}?sessionURL=${bgzip_file.qp}&genome=${site_organism}&merge=true&name=${qp( $bgzip_file.name )} #else: ${jnlp.url} #end if 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.