1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/7ddb0d7b4b12/ Changeset: 7ddb0d7b4b12 User: jmchilton Date: 2014-09-17 01:40:35+00:00 Summary: Merged in martenson/galaxy-central-marten (pull request #497) importing into library folders from Galaxy filesystem Affected #: 37 files diff -r 38be704a932fafd27b01034ae9daf83a465062bf -r 7ddb0d7b4b128089322b441c77eceaea5d993312 client/galaxy/scripts/galaxy.library.js --- a/client/galaxy/scripts/galaxy.library.js +++ b/client/galaxy/scripts/galaxy.library.js @@ -47,7 +47,8 @@ "folders/:folder_id/datasets/:dataset_id" : "dataset_detail", "folders/:folder_id/datasets/:dataset_id/permissions" : "dataset_permissions", "folders/:folder_id/datasets/:dataset_id/versions/:ldda_id" : "dataset_version", - "folders/:folder_id/download/:format" : "download" + "folders/:folder_id/download/:format" : "download", + "folders/:folder_id/import/:source" : "import_datasets" }, back: function() { @@ -147,6 +148,15 @@ } Galaxy.libraries.folderView = new mod_library_folder_view.FolderView({id: folder_id, show_permissions: true}); }); + this.library_router.on('route:import_datasets', function(folder_id, source){ + if (Galaxy.libraries.folderToolbarView && Galaxy.libraries.folderListView){ + Galaxy.libraries.folderToolbarView.showImportModal({source:source}); + } else { + Galaxy.libraries.folderToolbarView = new mod_foldertoolbar_view.FolderToolbarView({id: folder_id}); + Galaxy.libraries.folderListView = new mod_folderlist_view.FolderListView({id: folder_id}); + Galaxy.libraries.folderToolbarView.showImportModal({source: source}); + } + }); Backbone.history.start({pushState: false}); } This diff is so big that we needed to truncate the remainder. 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.