Merge branch 'fix_download_button' into dev

client/galaxy/scripts/mvc/collection/collection-view.js

@@ -41,7 +41,8 @@ var CollectionView = _super.extend(
             this.parentName = attributes.parentName;
             /** foldout or drilldown */
             this.foldoutStyle = attributes.foldoutStyle || "foldout";
-            this.downloadUrl = `${this.model.attributes.url}/download`;
+            this.downloadUrl = `${Galaxy.root}api/dataset_collections/${this.model.attributes.id}/download`;
+            console.log(this);
         },
 
         _queueNewRender: function($newRender, speed) {

lib/galaxy/managers/collections.py

@@ -333,10 +333,11 @@ class DatasetCollectionManager(object):
     def __get_history_collection_instance(self, trans, id, check_ownership=False, check_accessible=True):
         instance_id = int(trans.app.security.decode_id(id))
         collection_instance = trans.sa_session.query(trans.app.model.HistoryDatasetCollectionAssociation).get(instance_id)
+        history = getattr(trans, 'history', collection_instance.history)
         if check_ownership:
-            self.history_manager.error_unless_owner(collection_instance.history, trans.user, current_history=trans.history)
+            self.history_manager.error_unless_owner(collection_instance.history, trans.user, current_history=history)
         if check_accessible:
-            self.history_manager.error_unless_accessible(collection_instance.history, trans.user, current_history=trans.history)
+            self.history_manager.error_unless_accessible(collection_instance.history, trans.user, current_history=history)
         return collection_instance
 
     def __get_library_collection_instance(self, trans, id, check_ownership=False, check_accessible=True):

lib/galaxy/webapps/galaxy/api/history_contents.py

@@ -171,9 +171,10 @@ class HistoryContentsController(BaseAPIController, UsesLibraryMixin, UsesLibrary
             return {'error': str(e)}
 
     @expose_api_raw_anonymous
-    def download_dataset_collection(self, trans, id, history_id, **kwd):
+    def download_dataset_collection(self, trans, id, history_id=None, **kwd):
         """
         * GET /api/histories/{history_id}/contents/{id}/download
+        * GET /api/dataset_collection/{id}/download
 
         Download the content of a HistoryDatasetCollection as a tgz archive
         while maintaining approximate collection structure.

lib/galaxy/webapps/galaxy/buildapp.py

@@ -366,6 +366,10 @@ def populate_api_routes(webapp, app):
                           controller='history_contents',
                           action='download_dataset_collection',
                           conditions=dict(method=["GET"]))
+    webapp.mapper.connect("/api/dataset_collections/{id}/download",
+                          controller='history_contents',
+                          action='download_dataset_collection',
+                          conditions=dict(method=["GET"]))
 
     # ---- visualizations registry ---- generic template renderer
     # @deprecated: this route should be considered deprecated

static/scripts/mvc/collection/collection-view.js

@@ -1,2 +1,2 @@
-define("mvc/collection/collection-view",["exports","mvc/list/list-view","mvc/collection/collection-model","mvc/collection/collection-li","mvc/base-mvc","utils/localization"],function(e,t,i,l,s,o){"use strict";function n(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(e,"__esModule",{value:!0});var a=n(t),c=(n(i),n(l)),d=n(s),r=n(o),f=a.default.ModelListPanel,u=f.extend({_logNamespace:"collections",className:f.prototype.className+" dataset-collection-panel",DatasetDCEViewClass:c.default.DatasetDCEListItemView,NestedDCDCEViewClass:c.default.NestedDCDCEListItemView,modelCollectionKey:"elements",initialize:function(e){f.prototype.initialize.call(this,e),this.linkTarget=e.linkTarget||"_blank",this.hasUser=e.hasUser,this.panelStack=[],this.parentName=e.parentName,this.foldoutStyle=e.foldoutStyle||"foldout",this.downloadUrl=this.model.attributes.url+"/download"},_queueNewRender:function(e,t){t=void 0===t?this.fxSpeed:t;var i=this;i.log("_queueNewRender:",e,t),i._swapNewRender(e),i.trigger("rendered",i)},_filterCollection:function(){return this.model.getVisibleContents()},_getItemViewClass:function(e){switch(e.get("element_type")){case"hda":return this.DatasetDCEViewClass;case"dataset_collection":return this.NestedDCDCEViewClass}throw new TypeError("Unknown element type:",e.get("element_type"))},_getItemViewOptions:function(e){var t=f.prototype._getItemViewOptions.call(this,e);return _.extend(t,{linkTarget:this.linkTarget,hasUser:this.hasUser,foldoutStyle:this.foldoutStyle})},_setUpItemViewListeners:function(e){var t=this;return f.prototype._setUpItemViewListeners.call(t,e),t.listenTo(e,{"expanded:drilldown":function(e,t){this._expandDrilldownPanel(t)},"collapsed:drilldown":function(e,t){this._collapseDrilldownPanel(t)}}),this},_expandDrilldownPanel:function(e){this.panelStack.push(e),this.$("> .controls").add(this.$list()).hide(),e.parentName=this.model.get("name"),this.$el.append(e.render().$el)},_collapseDrilldownPanel:function(e){this.panelStack.pop(),this.render()},events:{"click .navigation .back":"close"},close:function(e){this.remove(),this.trigger("close")},toString:function(){return"CollectionView("+(this.model?this.model.get("name"):"")+")"}});u.prototype.templates=function(){var e=d.default.wrapTemplate(['<div class="controls">','<div class="navigation">','<a class="back" href="javascript:void(0)">','<span class="fa fa-icon fa-angle-left"></span>',(0,r.default)("Back to "),"<%- view.parentName %>","</a>","</div>",'<div class="title">','<div class="name"><%- collection.name || collection.element_identifier %></div>','<div class="subtitle">','<% if( collection.collection_type === "list" ){ %>',(0,r.default)("a list of datasets"),'<% } else if( collection.collection_type === "paired" ){ %>',(0,r.default)("a pair of datasets"),'<% } else if( collection.collection_type === "list:paired" ){ %>',(0,r.default)("a list of paired datasets"),'<% } else if( collection.collection_type === "list:list" ){ %>',(0,r.default)("a list of dataset lists"),"<% } %>","</div>","</div>",'<div class="tags-display"></div>','<div class="actions">','<a class="download-btn icon-btn" ','href="<%- view.downloadUrl %>','" title="" download="" data-original-title="Download Collection">','<span class="fa fa-floppy-o"></span>',"</a>","</div>","</div>"],"collection");return _.extend(_.clone(f.prototype.templates),{controls:e})}();var p=u.extend({DatasetDCEViewClass:c.default.DatasetDCEListItemView,toString:function(){return"ListCollectionView("+(this.model?this.model.get("name"):"")+")"}}),m=p.extend({toString:function(){return"PairCollectionView("+(this.model?this.model.get("name"):"")+")"}}),w=u.extend({NestedDCDCEViewClass:c.default.NestedDCDCEListItemView.extend({foldoutPanelClass:m}),toString:function(){return"ListOfPairsCollectionView("+(this.model?this.model.get("name"):"")+")"}}),h=u.extend({NestedDCDCEViewClass:c.default.NestedDCDCEListItemView.extend({foldoutPanelClass:m}),toString:function(){return"ListOfListsCollectionView("+(this.model?this.model.get("name"):"")+")"}});e.default={CollectionView:u,ListCollectionView:p,PairCollectionView:m,ListOfPairsCollectionView:w,ListOfListsCollectionView:h}});
+define("mvc/collection/collection-view",["exports","mvc/list/list-view","mvc/collection/collection-model","mvc/collection/collection-li","mvc/base-mvc","utils/localization"],function(e,t,i,l,o,s){"use strict";function n(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(e,"__esModule",{value:!0});var a=n(t),c=(n(i),n(l)),d=n(o),r=n(s),f=a.default.ModelListPanel,p=f.extend({_logNamespace:"collections",className:f.prototype.className+" dataset-collection-panel",DatasetDCEViewClass:c.default.DatasetDCEListItemView,NestedDCDCEViewClass:c.default.NestedDCDCEListItemView,modelCollectionKey:"elements",initialize:function(e){f.prototype.initialize.call(this,e),this.linkTarget=e.linkTarget||"_blank",this.hasUser=e.hasUser,this.panelStack=[],this.parentName=e.parentName,this.foldoutStyle=e.foldoutStyle||"foldout",this.downloadUrl=Galaxy.root+"api/dataset_collections/"+this.model.attributes.id+"/download",console.log(this)},_queueNewRender:function(e,t){t=void 0===t?this.fxSpeed:t;var i=this;i.log("_queueNewRender:",e,t),i._swapNewRender(e),i.trigger("rendered",i)},_filterCollection:function(){return this.model.getVisibleContents()},_getItemViewClass:function(e){switch(e.get("element_type")){case"hda":return this.DatasetDCEViewClass;case"dataset_collection":return this.NestedDCDCEViewClass}throw new TypeError("Unknown element type:",e.get("element_type"))},_getItemViewOptions:function(e){var t=f.prototype._getItemViewOptions.call(this,e);return _.extend(t,{linkTarget:this.linkTarget,hasUser:this.hasUser,foldoutStyle:this.foldoutStyle})},_setUpItemViewListeners:function(e){var t=this;return f.prototype._setUpItemViewListeners.call(t,e),t.listenTo(e,{"expanded:drilldown":function(e,t){this._expandDrilldownPanel(t)},"collapsed:drilldown":function(e,t){this._collapseDrilldownPanel(t)}}),this},_expandDrilldownPanel:function(e){this.panelStack.push(e),this.$("> .controls").add(this.$list()).hide(),e.parentName=this.model.get("name"),this.$el.append(e.render().$el)},_collapseDrilldownPanel:function(e){this.panelStack.pop(),this.render()},events:{"click .navigation .back":"close"},close:function(e){this.remove(),this.trigger("close")},toString:function(){return"CollectionView("+(this.model?this.model.get("name"):"")+")"}});p.prototype.templates=function(){var e=d.default.wrapTemplate(['<div class="controls">','<div class="navigation">','<a class="back" href="javascript:void(0)">','<span class="fa fa-icon fa-angle-left"></span>',(0,r.default)("Back to "),"<%- view.parentName %>","</a>","</div>",'<div class="title">','<div class="name"><%- collection.name || collection.element_identifier %></div>','<div class="subtitle">','<% if( collection.collection_type === "list" ){ %>',(0,r.default)("a list of datasets"),'<% } else if( collection.collection_type === "paired" ){ %>',(0,r.default)("a pair of datasets"),'<% } else if( collection.collection_type === "list:paired" ){ %>',(0,r.default)("a list of paired datasets"),'<% } else if( collection.collection_type === "list:list" ){ %>',(0,r.default)("a list of dataset lists"),"<% } %>","</div>","</div>",'<div class="tags-display"></div>','<div class="actions">','<a class="download-btn icon-btn" ','href="<%- view.downloadUrl %>','" title="" download="" data-original-title="Download Collection">','<span class="fa fa-floppy-o"></span>',"</a>","</div>","</div>"],"collection");return _.extend(_.clone(f.prototype.templates),{controls:e})}();var u=p.extend({DatasetDCEViewClass:c.default.DatasetDCEListItemView,toString:function(){return"ListCollectionView("+(this.model?this.model.get("name"):"")+")"}}),m=u.extend({toString:function(){return"PairCollectionView("+(this.model?this.model.get("name"):"")+")"}}),h=p.extend({NestedDCDCEViewClass:c.default.NestedDCDCEListItemView.extend({foldoutPanelClass:m}),toString:function(){return"ListOfPairsCollectionView("+(this.model?this.model.get("name"):"")+")"}}),w=p.extend({NestedDCDCEViewClass:c.default.NestedDCDCEListItemView.extend({foldoutPanelClass:m}),toString:function(){return"ListOfListsCollectionView("+(this.model?this.model.get("name"):"")+")"}});e.default={CollectionView:p,ListCollectionView:u,PairCollectionView:m,ListOfPairsCollectionView:h,ListOfListsCollectionView:w}});
 //# sourceMappingURL=../../../maps/mvc/collection/collection-view.js.map