1 new changeset in galaxy-central:
http://bitbucket.org/galaxy/galaxy-central/changeset/c928c92a0351/
changeset: r5022:c928c92a0351
user: rc
date: 2011-02-08 19:43:39
summary: fix for transfer dataset bug caused due to un-sanitized sample names
affected #: 1 file (71 bytes)
--- a/lib/galaxy/web/controllers/requests_admin.py Tue Feb 08 13:36:38 2011 -0500
+++ b/lib/galaxy/web/controllers/requests_admin.py Tue Feb 08 13:43:39 2011 -0500
@@ -514,13 +514,14 @@
options = sample.request.type.rename_dataset_options
option = scp_configs.get( 'rename_dataset', options.NO )
if option == options.SAMPLE_NAME:
- return sample.name + '_' + name
+ new_name = sample.name + '_' + name
if option == options.EXPERIMENT_AND_SAMPLE_NAME:
- return sample.request.name + '_' + sample.name + '_' + name
+ new_name = sample.request.name + '_' + sample.name + '_' + name
if option == options.EXPERIMENT_NAME:
- return sample.request.name + '_' + name
+ new_name = sample.request.name + '_' + name
else:
- return name
+ new_name = name
+ return util.sanitize_for_filename( new_name )
def __check_library_add_permission( self, trans, target_library, target_folder ):
"""
Checks if the current admin user had ADD_LIBRARY permission on the target library
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 new changeset in galaxy-central:
http://bitbucket.org/galaxy/galaxy-central/changeset/a63f9278392d/
changeset: r5016:a63f9278392d
user: kanwei
date: 2011-02-07 22:59:12
summary: trackster: move summary count text darker and aligned at the top for better visibility in most cases, and only draw if there is some padding so that numbers don't bunch up
affected #: 1 file (148 bytes)
--- a/static/scripts/trackster.js Mon Feb 07 15:22:23 2011 -0500
+++ b/static/scripts/trackster.js Mon Feb 07 16:59:12 2011 -0500
@@ -2352,10 +2352,12 @@
ctx.fillStyle = "black";
ctx.fillRect(x + left_offset, this.summary_draw_height - y_px, delta_x_px, y_px);
- if (this.prefs.show_counts && ctx.measureText(y).width < delta_x_px) {
- ctx.fillStyle = "#bbb";
+ // Draw number count if it can fit the number with some padding, otherwise things clump up
+ var text_padding_req_x = 4;
+ if (this.prefs.show_counts && (ctx.measureText(y).width + text_padding_req_x) < delta_x_px) {
+ ctx.fillStyle = "#666";
ctx.textAlign = "center";
- ctx.fillText(y, x + left_offset + (delta_x_px/2), this.summary_draw_height - 5);
+ ctx.fillText(y, x + left_offset + (delta_x_px/2), 10);
}
}
return canvas;
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.