Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[16.10] Escape filename in upload dialog, default and composite. #3278

Merged
merged 2 commits into from Dec 7, 2016
Merged

[16.10] Escape filename in upload dialog, default and composite. #3278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8766e12
Escape filename in upload dialog, default and composite. Pointed out…
dannon Dec 7, 2016
13ab070
Use consistent spacing.
dannon Dec 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/galaxy/scripts/mvc/upload/composite/composite-row.js
View file
Open in desktop
Expand Up @@ -115,7 +115,7 @@ function( Utils, UploadSettings, UploadFtp, Popover, Ui, Select ) {

render: function() {
this.$el.attr( 'id', 'upload-row-' + this.model.id );
this.$file_name.html( this.model.get( 'file_name' ) || '-' );
this.$file_name.html( _.escape( this.model.get( 'file_name' ) || '-' ) );
this.$file_desc.html( this.model.get( 'file_desc' ) || 'Unavailable' );
this.$file_size.html( Utils.bytesToString ( this.model.get( 'file_size' ) ) );
this.$status.removeClass().addClass( this.status_classes.init );
Expand Down
4 changes: 2 additions & 2 deletions client/galaxy/scripts/mvc/upload/default/default-row.js
View file
Open in desktop
Expand Up @@ -95,7 +95,7 @@ function( Utils, UploadModel, UploadSettings, Popover, Select ) {

render: function() {
var options = this.model.attributes;
this.$title.html( options.file_name );
this.$title.html( _.escape( options.file_name ) );
this.$size.html( Utils.bytesToString ( options.file_size ) );
this.$mode.removeClass().addClass( 'upload-mode' ).addClass( 'text-primary' );
if ( options.file_mode == 'new' ) {
Expand All @@ -120,7 +120,7 @@ function( Utils, UploadModel, UploadSettings, Popover, Select ) {
_refreshExtension: function() {
this.select_extension.value( this.model.get( 'extension' ) );
},

/** Update genome */
_refreshGenome: function() {
this.select_genome.value( this.model.get( 'genome' ) );
Expand Down
2 changes: 1 addition & 1 deletion static/maps/mvc/upload/composite/composite-row.js.map
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.