Merge pull request galaxyproject#3292 from dannon/backport_upload_fn_…

…escape [16.07] Upload file escaping backport.
jmchilton · Dec 9, 2016 · 602f2f2 · 602f2f2
2 parents 7272702 + c315f1d
commit 602f2f2
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 36 deletions.
diff --git a/client/galaxy/scripts/mvc/upload/composite/composite-row.js b/client/galaxy/scripts/mvc/upload/composite/composite-row.js
@@ -157,7 +157,7 @@ return Backbone.View.extend({
 
     // render
     render: function() {
-        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);

diff --git a/client/galaxy/scripts/mvc/upload/default/default-row.js b/client/galaxy/scripts/mvc/upload/default/default-row.js
@@ -150,7 +150,7 @@ return Backbone.View.extend({
         var file_mode   = this.model.get('file_mode');
 
         // update title
-        this.$('#title').html(file_name);
+        this.$('#title').html(_.escape(file_name));
 
         // update info
         this.$('#size').html(Utils.bytesToString (file_size));

diff --git a/static/maps/mvc/upload/composite/composite-row.js.map b/static/maps/mvc/upload/composite/composite-row.js.map