2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/283776e0ad29/ changeset: 283776e0ad29 user: jgoecks date: 2012-10-23 19:30:26 summary: Make DiagonalHeatMapTrack compatible with recent refactoring. affected #: 1 file diff -r 6b0cc1c4f105f9562066bcbad46ed00858e9372a -r 283776e0ad29cd9638d5be726fe051d985922c48 static/scripts/viz/trackster/tracks.js --- a/static/scripts/viz/trackster/tracks.js +++ b/static/scripts/viz/trackster/tracks.js @@ -3686,17 +3686,14 @@ /** * Draw LineTrack tile. */ - draw_tile: function(result, ctx, mode, resolution, tile_index, w_scale) { + draw_tile: function(result, ctx, mode, resolution, region, w_scale) { // Paint onto canvas. var canvas = ctx.canvas, - tile_bounds = this._get_tile_bounds(tile_index, resolution), - tile_low = tile_bounds[0], - tile_high = tile_bounds[1], - painter = new painters.DiagonalHeatmapPainter(result.data, tile_low, tile_high, this.prefs, mode); + painter = new painters.DiagonalHeatmapPainter(result.data, region.get('start'), region.get('end'), this.prefs, mode); painter.draw(ctx, canvas.width, canvas.height, w_scale); - return new Tile(this, tile_index, resolution, canvas, result.data); + return new Tile(this, region, resolution, canvas, result.data); } }); https://bitbucket.org/galaxy/galaxy-central/changeset/26017976e4e9/ changeset: 26017976e4e9 user: jgoecks date: 2012-10-23 19:30:56 summary: Automated Merge affected #: 3 files diff -r 283776e0ad29cd9638d5be726fe051d985922c48 -r 26017976e4e9d5de317e0b1ef29423effdbe5e24 lib/galaxy/webapps/community/controllers/repository.py --- a/lib/galaxy/webapps/community/controllers/repository.py +++ b/lib/galaxy/webapps/community/controllers/repository.py @@ -20,6 +20,8 @@ from galaxy import eggs eggs.require('mercurial') from mercurial import hg, ui, patch, commands +eggs.require('markupsafe') +from markupsafe import escape as escape_html log = logging.getLogger( __name__ ) @@ -105,7 +107,7 @@ class RepositoryGrid( grids.Grid ): class NameColumn( grids.TextColumn ): def get_value( self, trans, grid, repository ): - return repository.name + return escape_html( repository.name ) class MetadataRevisionColumn( grids.GridColumn ): def __init__( self, col_name ): grids.GridColumn.__init__( self, col_name ) @@ -137,10 +139,10 @@ grids.GridColumn.__init__( self, col_name ) def get_value( self, trans, grid, repository ): """Display the repository tip revision label.""" - return repository.revision + return escape_html( repository.revision ) class DescriptionColumn( grids.TextColumn ): def get_value( self, trans, grid, repository ): - return repository.description + return escape_html( repository.description ) class CategoryColumn( grids.TextColumn ): def get_value( self, trans, grid, repository ): rval = '<ul>' @@ -161,7 +163,7 @@ class UserColumn( grids.TextColumn ): def get_value( self, trans, grid, repository ): if repository.user: - return repository.user.username + return escape_html( repository.user.username ) return 'no user' class EmailColumn( grids.TextColumn ): def filter( self, trans, user, query, column_filter ): diff -r 283776e0ad29cd9638d5be726fe051d985922c48 -r 26017976e4e9d5de317e0b1ef29423effdbe5e24 templates/webapps/community/common/common.mako --- a/templates/webapps/community/common/common.mako +++ b/templates/webapps/community/common/common.mako @@ -1,5 +1,7 @@ <%def name="escape_html_add_breaks( value )"><% + from galaxy import eggs + eggs.require('markupsafe') import markupsafe value = str( markupsafe.escape( value ) ).replace( '\n', '<br/>' ) %> diff -r 283776e0ad29cd9638d5be726fe051d985922c48 -r 26017976e4e9d5de317e0b1ef29423effdbe5e24 test/base/twilltestcase.py --- a/test/base/twilltestcase.py +++ b/test/base/twilltestcase.py @@ -746,9 +746,9 @@ temp_local = tempfile.NamedTemporaryFile( suffix='.sam', prefix='local_bam_converted_to_sam_' ) fd, temp_temp = tempfile.mkstemp( suffix='.sam', prefix='history_bam_converted_to_sam_' ) os.close( fd ) - p = subprocess.Popen( args="samtools view -h %s -o %s" % ( local_name, temp_local.name ), shell=True ) + p = subprocess.Popen( args='samtools view -h -o "%s" "%s"' % ( temp_local.name, local_name ), shell=True ) assert not p.wait(), 'Converting local (test-data) bam to sam failed' - p = subprocess.Popen( args="samtools view -h %s -o %s" % ( temp_name, temp_temp ), shell=True ) + p = subprocess.Popen( args='samtools view -h -o "%s" "%s"' % ( temp_temp, temp_name ), shell=True ) assert not p.wait(), 'Converting history bam to sam failed' os.remove( temp_name ) return temp_local, temp_temp 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.