opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7432 from martenson/fix-lib-paths

Browse Source 
[19.01] send post data in payload
This commit is contained in:
Marius van den Beek
2019-03-01 09:51:28 +01:00
committed by GitHub
parent 64a0152a6b 2039376ddf
commit c40689dbd5
1 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js
+29 -24
View File
@@ -878,7 +878,7 @@ var FolderToolbarView = Backbone.View.extend({
*/
chainCallImportingUserdirFiles: function(options) {
let Galaxy = getGalaxyInstance();
var popped_item = options.paths.pop();
let popped_item = options.paths.pop();
if (typeof popped_item === "undefined") {
if (this.options.chain_call_control.failed_number === 0) {
mod_toastr.success("Selected files imported into the current folder");
@@ -888,17 +888,19 @@ var FolderToolbarView = Backbone.View.extend({
}
return true;
}
var promise = $.when(
$.post(
`${getAppRoot()}api/libraries/datasets?encoded_folder_id=${this.id}&source=${
options.source
}&path=${popped_item}&file_type=${options.file_type}&link_data=${options.link_data}&space_to_tab=${
options.space_to_tab
}&to_posix_lines=${options.to_posix_lines}&dbkey=${options.dbkey}&tag_using_filenames=${
options.tag_using_filenames
}`
)
);
let post_url = `${getAppRoot()}api/libraries/datasets`;
let post_data = {
encoded_folder_id: this.id,
source: options.source,
path: popped_item,
file_type: options.file_type,
link_data: options.link_data,
space_to_tab: options.space_to_tab,
to_posix_lines: options.to_posix_lines,
dbkey: options.dbkey,
tag_using_filenames: options.tag_using_filenames
};
let promise = $.when($.post(post_url, post_data));
promise
.done(response => {
this.updateProgress();
@@ -926,7 +928,7 @@ var FolderToolbarView = Backbone.View.extend({
chainCallImportingFolders: function(options) {
let Galaxy = getGalaxyInstance();
// TODO need to check which paths to call
var popped_item = options.paths.pop();
let popped_item = options.paths.pop();
if (typeof popped_item == "undefined") {
if (this.options.chain_call_control.failed_number === 0) {
mod_toastr.success("Selected folders and their contents imported into the current folder.");
@@ -937,17 +939,20 @@ var FolderToolbarView = Backbone.View.extend({
}
return true;
}
var promise = $.when(
$.post(
`${getAppRoot()}api/libraries/datasets?encoded_folder_id=${this.id}&source=${
options.source
}&path=${popped_item}&preserve_dirs=${options.preserve_dirs}&link_data=${
options.link_data
}&to_posix_lines=${options.to_posix_lines}&space_to_tab=${options.space_to_tab}&file_type=${
options.file_type
}&dbkey=${options.dbkey}&tag_using_filenames=${options.tag_using_filenames}`
)
);
let post_url = `${getAppRoot()}api/libraries/datasets`;
let post_data = {
encoded_folder_id: this.id,
source: options.source,
path: popped_item,
preserve_dirs: options.preserve_dirs,
link_data: options.link_data,
to_posix_lines: options.to_posix_lines,
space_to_tab: options.space_to_tab,
file_type: options.file_type,
dbkey: options.dbkey,
tag_using_filenames: options.tag_using_filenames
};
let promise = $.when($.post(post_url, post_data));
promise
.done(response => {
this.updateProgress();