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 #37 from martenson/release_15.03

Browse Source 
[STABLE] fix libraries to work with proxy prefix
This commit is contained in:
Martin Cech
2015-03-25 15:23:17 -04:00
parent ddaad9dad5 4f53a85ea1
commit d5aeb952ce
15 changed files with 73 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/galaxy/scripts/mvc/library/library-dataset-view.js
+9 -9
View File
@@ -116,7 +116,7 @@ var LibraryDatasetView = Backbone.View.extend({
},
downloadDataset: function(){
var url = '/api/libraries/datasets/download/uncompressed';
var url = ( window.galaxy_config ? galaxy_config.root : '/' ) + 'api/libraries/datasets/download/uncompressed';
var data = {'ld_ids' : this.id};
this.processDownload(url, data);
},
@@ -232,7 +232,7 @@ var LibraryDatasetView = Backbone.View.extend({
var self = this;
if (this.options.fetched_permissions === undefined){
$.get( "/api/libraries/datasets/" + self.id + "/permissions?scope=current").done(function(fetched_permissions) {
$.get( ( window.galaxy_config ? galaxy_config.root : '/' ) + "api/libraries/datasets/" + self.id + "/permissions?scope=current").done(function(fetched_permissions) {
self.prepareSelectBoxes({fetched_permissions:fetched_permissions, is_admin:is_admin});
}).fail(function(){
mod_toastr.error('An error occurred while attempting to fetch dataset permissions.');
@@ -273,7 +273,7 @@ var LibraryDatasetView = Backbone.View.extend({
placeholder: 'Click to select a role',
container: self.$el.find('#access_perm'),
ajax: {
url: "/api/libraries/datasets/" + self.id + "/permissions?scope=available",
url: ( window.galaxy_config ? galaxy_config.root : '/' ) + "api/libraries/datasets/" + self.id + "/permissions?scope=available",
dataType: 'json',
quietMillis: 100,
data: function (term, page) { // page is the one-based page number tracked by Select2
@@ -320,7 +320,7 @@ var LibraryDatasetView = Backbone.View.extend({
placeholder: 'Click to select a role',
container: self.$el.find('#modify_perm'),
ajax: {
url: "/api/libraries/datasets/" + self.id + "/permissions?scope=available",
url: ( window.galaxy_config ? galaxy_config.root : '/' ) + "api/libraries/datasets/" + self.id + "/permissions?scope=available",
dataType: 'json',
quietMillis: 100,
data: function (term, page) { // page is the one-based page number tracked by Select2
@@ -367,7 +367,7 @@ var LibraryDatasetView = Backbone.View.extend({
placeholder: 'Click to select a role',
container: self.$el.find('#manage_perm'),
ajax: {
url: "/api/libraries/datasets/" + self.id + "/permissions?scope=available",
url: ( window.galaxy_config ? galaxy_config.root : '/' ) + "api/libraries/datasets/" + self.id + "/permissions?scope=available",
dataType: 'json',
quietMillis: 100,
data: function (term, page) { // page is the one-based page number tracked by Select2
@@ -413,7 +413,7 @@ var LibraryDatasetView = Backbone.View.extend({
self.manageSelectObject = new mod_select.View(manage_select_options);
} else { // Non-admins have select with pre-loaded options
var template = self.templateAccessSelect();
$.get( "/api/libraries/datasets/" + self.id + "/permissions?scope=available", function( data ) {
$.get( ( window.galaxy_config ? galaxy_config.root : '/' ) + "api/libraries/datasets/" + self.id + "/permissions?scope=available", function( data ) {
$('.access_perm').html(template({options:data.roles}));
self.accessSelectObject = $('#access_select').select2();
}).fail(function() {
@@ -436,7 +436,7 @@ var LibraryDatasetView = Backbone.View.extend({
makeDatasetPrivate: function(){
var self = this;
$.post("/api/libraries/datasets/" + self.id + "/permissions?action=make_private").done(function(fetched_permissions) {
$.post( ( window.galaxy_config ? galaxy_config.root : '/' ) + "api/libraries/datasets/" + self.id + "/permissions?action=make_private").done(function(fetched_permissions) {
self.model.set({is_unrestricted:false});
self.showPermissions({fetched_permissions:fetched_permissions})
mod_toastr.success('The dataset is now private to you.');
@@ -447,7 +447,7 @@ var LibraryDatasetView = Backbone.View.extend({
removeDatasetRestrictions: function(){
var self = this;
$.post("/api/libraries/datasets/" + self.id + "/permissions?action=remove_restrictions")
$.post( ( window.galaxy_config ? galaxy_config.root : '/' ) + "api/libraries/datasets/" + self.id + "/permissions?action=remove_restrictions")
.done(function(fetched_permissions) {
self.model.set({is_unrestricted:true});
self.showPermissions({fetched_permissions:fetched_permissions})
@@ -478,7 +478,7 @@ var LibraryDatasetView = Backbone.View.extend({
modify_ids.push(modify_roles[i].id);
};
$.post("/api/libraries/datasets/" + self.id + "/permissions?action=set_permissions", { 'access_ids[]': access_ids, 'manage_ids[]': manage_ids, 'modify_ids[]': modify_ids, } )
$.post( ( window.galaxy_config ? galaxy_config.root : '/' ) + "api/libraries/datasets/" + self.id + "/permissions?action=set_permissions", { 'access_ids[]': access_ids, 'manage_ids[]': manage_ids, 'modify_ids[]': modify_ids, } )
.done(function(fetched_permissions){
//fetch dataset again
self.showPermissions({fetched_permissions:fetched_permissions})
client/galaxy/scripts/mvc/library/library-folder-view.js
+3 -3
View File
@@ -81,7 +81,7 @@ var FolderView = Backbone.View.extend({
var self = this;
if (this.options.fetched_permissions === undefined){
$.get( "/api/folders/" + self.id + "/permissions?scope=current").done(function(fetched_permissions) {
$.get( ( window.galaxy_config ? galaxy_config.root : '/' ) + "api/folders/" + self.id + "/permissions?scope=current").done(function(fetched_permissions) {
self.prepareSelectBoxes({fetched_permissions:fetched_permissions});
}).fail(function(){
mod_toastr.error('An error occurred while attempting to fetch folder permissions.');
@@ -125,7 +125,7 @@ var FolderView = Backbone.View.extend({
placeholder: 'Click to select a role',
container: self.$el.find('#' + id),
ajax: {
url: "/api/folders/" + self.id + "/permissions?scope=available",
url: ( window.galaxy_config ? galaxy_config.root : '/' ) + "api/folders/" + self.id + "/permissions?scope=available",
dataType: 'json',
quietMillis: 100,
data: function (term, page) { // page is the one-based page number tracked by Select2
@@ -195,7 +195,7 @@ var FolderView = Backbone.View.extend({
var manage_ids = this._extractIds(this.manageSelectObject.$el.select2('data'));
var modify_ids = this._extractIds(this.modifySelectObject.$el.select2('data'));
$.post("/api/folders/" + self.id + "/permissions?action=set_permissions", { 'add_ids[]': add_ids, 'manage_ids[]': manage_ids, 'modify_ids[]': modify_ids, } )
$.post( ( window.galaxy_config ? galaxy_config.root : '/' ) + "api/folders/" + self.id + "/permissions?action=set_permissions", { 'add_ids[]': add_ids, 'manage_ids[]': manage_ids, 'modify_ids[]': modify_ids, } )
.done(function(fetched_permissions){
//fetch dataset again
self.showPermissions({fetched_permissions:fetched_permissions})
client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js
+6 -6
View File
@@ -294,7 +294,7 @@ var FolderToolbarView = Backbone.View.extend({
dataset_ids.push( this.parentElement.parentElement.id );
}
} );
var url = '/api/libraries/datasets/download/' + format;
var url = ( window.galaxy_config ? galaxy_config.root : '/' ) + 'api/libraries/datasets/download/' + format;
var data = { 'ld_ids' : dataset_ids };
this.processDownload( url, data, 'get' );
},
@@ -386,7 +386,7 @@ var FolderToolbarView = Backbone.View.extend({
fetchExtAndGenomes: function(){
var that = this;
mod_utils.get({
url : galaxy_config.root + "api/datatypes?extension_only=False",
url : ( window.galaxy_config ? galaxy_config.root : '/' ) + "api/datatypes?extension_only=False",
success : function( datatypes ) {
for (key in datatypes) {
that.list_extensions.push({
@@ -403,7 +403,7 @@ var FolderToolbarView = Backbone.View.extend({
}
});
mod_utils.get({
url: galaxy_config.root + "api/genomes",
url: ( window.galaxy_config ? galaxy_config.root : '/' ) + "api/genomes",
success: function( genomes ) {
for ( key in genomes ) {
that.list_genomes.push({
@@ -689,7 +689,7 @@ var FolderToolbarView = Backbone.View.extend({
for ( var i = history_dataset_ids.length - 1; i >= 0; i-- ) {
history_dataset_id = history_dataset_ids[i];
var folder_item = new mod_library_model.Item();
folder_item.url = '/api/folders/' + this.options.id + '/contents';
folder_item.url = ( window.galaxy_config ? galaxy_config.root : '/' ) + 'api/folders/' + this.options.id + '/contents';
folder_item.set( { 'from_hda_id':history_dataset_id } );
hdas_to_add.push( folder_item );
}
@@ -749,7 +749,7 @@ var FolderToolbarView = Backbone.View.extend({
}
return true;
}
var promise = $.when( $.post( '/api/libraries/datasets?encoded_folder_id=' + that.id +
var promise = $.when( $.post( ( window.galaxy_config ? galaxy_config.root : '/' ) + 'api/libraries/datasets?encoded_folder_id=' + that.id +
'&source=' + options.source +
'&path=' + popped_item +
'&file_type=' + options.file_type +
@@ -788,7 +788,7 @@ var FolderToolbarView = Backbone.View.extend({
}
return true;
}
var promise = $.when( $.post( '/api/libraries/datasets?encoded_folder_id=' + that.id +
var promise = $.when( $.post( ( window.galaxy_config ? galaxy_config.root : '/' ) + 'api/libraries/datasets?encoded_folder_id=' + that.id +
'&source=' + options.source +
'&path=' + popped_item +
'&preserve_dirs=' + options.preserve_dirs +
client/galaxy/scripts/mvc/library/library-library-view.js
+5 -5
View File
@@ -87,7 +87,7 @@ var LibraryView = Backbone.View.extend({
var self = this;
if (this.options.fetched_permissions === undefined){
$.get( "/api/libraries/" + self.id + "/permissions?scope=current").done(function(fetched_permissions) {
$.get( ( window.galaxy_config ? galaxy_config.root : '/' ) + "api/libraries/" + self.id + "/permissions?scope=current").done(function(fetched_permissions) {
self.prepareSelectBoxes({fetched_permissions:fetched_permissions});
}).fail(function(){
mod_toastr.error('An error occurred while attempting to fetch library permissions.');
@@ -134,7 +134,7 @@ var LibraryView = Backbone.View.extend({
placeholder: 'Click to select a role',
container: self.$el.find('#' + id),
ajax: {
url: "/api/libraries/" + self.id + "/permissions?scope=available&is_library_access=" + is_library_access,
url: ( window.galaxy_config ? galaxy_config.root : '/' ) + "api/libraries/" + self.id + "/permissions?scope=available&is_library_access=" + is_library_access,
dataType: 'json',
quietMillis: 100,
data: function (term, page) { // page is the one-based page number tracked by Select2
@@ -193,7 +193,7 @@ var LibraryView = Backbone.View.extend({
makeDatasetPrivate: function(){
var self = this;
$.post("/api/libraries/datasets/" + self.id + "/permissions?action=make_private").done(function(fetched_permissions) {
$.post( ( window.galaxy_config ? galaxy_config.root : '/' ) + "api/libraries/datasets/" + self.id + "/permissions?action=make_private").done(function(fetched_permissions) {
self.model.set({is_unrestricted:false});
self.showPermissions({fetched_permissions:fetched_permissions})
mod_toastr.success('The dataset is now private to you.');
@@ -204,7 +204,7 @@ var LibraryView = Backbone.View.extend({
removeDatasetRestrictions: function(){
var self = this;
$.post("/api/libraries/datasets/" + self.id + "/permissions?action=remove_restrictions")
$.post( ( window.galaxy_config ? galaxy_config.root : '/' ) + "api/libraries/datasets/" + self.id + "/permissions?action=remove_restrictions")
.done(function(fetched_permissions) {
self.model.set({is_unrestricted:true});
self.showPermissions({fetched_permissions:fetched_permissions})
@@ -230,7 +230,7 @@ var LibraryView = Backbone.View.extend({
var manage_ids = this._extractIds(this.manageSelectObject.$el.select2('data'));
var modify_ids = this._extractIds(this.modifySelectObject.$el.select2('data'));
$.post("/api/libraries/" + self.id + "/permissions?action=set_permissions", { 'access_ids[]': access_ids, 'add_ids[]': add_ids, 'manage_ids[]': manage_ids, 'modify_ids[]': modify_ids, } )
$.post( ( window.galaxy_config ? galaxy_config.root : '/' ) + "api/libraries/" + self.id + "/permissions?action=set_permissions", { 'access_ids[]': access_ids, 'add_ids[]': add_ids, 'manage_ids[]': manage_ids, 'modify_ids[]': modify_ids, } )
.done(function(fetched_permissions){
//fetch dataset again
self.showPermissions({fetched_permissions:fetched_permissions})
client/galaxy/scripts/mvc/library/library-model.js
+11 -11
View File
@@ -4,7 +4,7 @@ define([], function() {
// LIBRARY RELATED MODELS
var Library = Backbone.Model.extend({
urlRoot: '/api/libraries/',
urlRoot: ( window.galaxy_config ? galaxy_config.root : '/' ) + 'api/libraries/',
/** based on show_deleted would this lib show in the list of lib's?
* @param {Boolean} show_deleted are we including deleted libraries?
@@ -19,7 +19,7 @@ define([], function() {
});
var Libraries = Backbone.Collection.extend({
url: '/api/libraries',
url: ( window.galaxy_config ? galaxy_config.root : '/' ) + 'api/libraries',
model: Library,
@@ -84,15 +84,15 @@ define([], function() {
// FOLDER RELATED MODELS
var Item = Backbone.Model.extend({
urlRoot : '/api/libraries/datasets/'
urlRoot : ( window.galaxy_config ? galaxy_config.root : '/' ) + 'api/libraries/datasets/'
});
var Ldda = Backbone.Model.extend({
urlRoot : '/api/libraries/datasets/'
urlRoot : ( window.galaxy_config ? galaxy_config.root : '/' ) + 'api/libraries/datasets/'
});
var FolderAsModel = Backbone.Model.extend({
urlRoot: '/api/folders'
urlRoot: ( window.galaxy_config ? galaxy_config.root : '/' ) + 'api/folders'
});
var Folder = Backbone.Collection.extend({
@@ -152,7 +152,7 @@ define([], function() {
var FolderContainer = Backbone.Model.extend({
defaults : {
folder : new Folder(),
urlRoot : "/api/folders/",
urlRoot : ( window.galaxy_config ? galaxy_config.root : '/' ) + 'api/folders/',
id : "unknown"
},
parse : function(obj) {
@@ -169,11 +169,11 @@ define([], function() {
// TODO UNITE
var HistoryItem = Backbone.Model.extend({
urlRoot : '/api/histories/'
urlRoot : ( window.galaxy_config ? galaxy_config.root : '/' ) + 'api/histories/'
});
var HistoryContents = Backbone.Collection.extend({
urlRoot : '/api/histories/',
urlRoot : ( window.galaxy_config ? galaxy_config.root : '/' ) + 'api/histories/',
initialize: function(options){
this.id = options.id;
},
@@ -184,11 +184,11 @@ define([], function() {
});
var GalaxyHistory = Backbone.Model.extend({
urlRoot : '/api/histories/'
urlRoot : ( window.galaxy_config ? galaxy_config.root : '/' ) + 'api/histories/'
});
var GalaxyHistories = Backbone.Collection.extend({
url : '/api/histories',
url : ( window.galaxy_config ? galaxy_config.root : '/' ) + 'api/histories',
model : GalaxyHistory
});
@@ -199,7 +199,7 @@ define([], function() {
*/
var Jstree = Backbone.Model.extend({
urlRoot: '/api/remote_files'
urlRoot: ( window.galaxy_config ? galaxy_config.root : '/' ) + 'api/remote_files'
});
return {
static/scripts/mvc/library/library-dataset-view.js
+9 -9
View File
@@ -116,7 +116,7 @@ var LibraryDatasetView = Backbone.View.extend({
},
downloadDataset: function(){
var url = '/api/libraries/datasets/download/uncompressed';
var url = ( window.galaxy_config ? galaxy_config.root : '/' ) + 'api/libraries/datasets/download/uncompressed';
var data = {'ld_ids' : this.id};
this.processDownload(url, data);
},
@@ -232,7 +232,7 @@ var LibraryDatasetView = Backbone.View.extend({
var self = this;
if (this.options.fetched_permissions === undefined){
$.get( "/api/libraries/datasets/" + self.id + "/permissions?scope=current").done(function(fetched_permissions) {
$.get( ( window.galaxy_config ? galaxy_config.root : '/' ) + "api/libraries/datasets/" + self.id + "/permissions?scope=current").done(function(fetched_permissions) {
self.prepareSelectBoxes({fetched_permissions:fetched_permissions, is_admin:is_admin});
}).fail(function(){
mod_toastr.error('An error occurred while attempting to fetch dataset permissions.');
@@ -273,7 +273,7 @@ var LibraryDatasetView = Backbone.View.extend({
placeholder: 'Click to select a role',
container: self.$el.find('#access_perm'),
ajax: {
url: "/api/libraries/datasets/" + self.id + "/permissions?scope=available",
url: ( window.galaxy_config ? galaxy_config.root : '/' ) + "api/libraries/datasets/" + self.id + "/permissions?scope=available",
dataType: 'json',
quietMillis: 100,
data: function (term, page) { // page is the one-based page number tracked by Select2
@@ -320,7 +320,7 @@ var LibraryDatasetView = Backbone.View.extend({
placeholder: 'Click to select a role',
container: self.$el.find('#modify_perm'),
ajax: {
url: "/api/libraries/datasets/" + self.id + "/permissions?scope=available",
url: ( window.galaxy_config ? galaxy_config.root : '/' ) + "api/libraries/datasets/" + self.id + "/permissions?scope=available",
dataType: 'json',
quietMillis: 100,
data: function (term, page) { // page is the one-based page number tracked by Select2
@@ -367,7 +367,7 @@ var LibraryDatasetView = Backbone.View.extend({
placeholder: 'Click to select a role',
container: self.$el.find('#manage_perm'),
ajax: {
url: "/api/libraries/datasets/" + self.id + "/permissions?scope=available",
url: ( window.galaxy_config ? galaxy_config.root : '/' ) + "api/libraries/datasets/" + self.id + "/permissions?scope=available",
dataType: 'json',
quietMillis: 100,
data: function (term, page) { // page is the one-based page number tracked by Select2
@@ -413,7 +413,7 @@ var LibraryDatasetView = Backbone.View.extend({
self.manageSelectObject = new mod_select.View(manage_select_options);
} else { // Non-admins have select with pre-loaded options
var template = self.templateAccessSelect();
$.get( "/api/libraries/datasets/" + self.id + "/permissions?scope=available", function( data ) {
$.get( ( window.galaxy_config ? galaxy_config.root : '/' ) + "api/libraries/datasets/" + self.id + "/permissions?scope=available", function( data ) {
$('.access_perm').html(template({options:data.roles}));
self.accessSelectObject = $('#access_select').select2();
}).fail(function() {
@@ -436,7 +436,7 @@ var LibraryDatasetView = Backbone.View.extend({
makeDatasetPrivate: function(){
var self = this;
$.post("/api/libraries/datasets/" + self.id + "/permissions?action=make_private").done(function(fetched_permissions) {
$.post( ( window.galaxy_config ? galaxy_config.root : '/' ) + "api/libraries/datasets/" + self.id + "/permissions?action=make_private").done(function(fetched_permissions) {
self.model.set({is_unrestricted:false});
self.showPermissions({fetched_permissions:fetched_permissions})
mod_toastr.success('The dataset is now private to you.');
@@ -447,7 +447,7 @@ var LibraryDatasetView = Backbone.View.extend({
removeDatasetRestrictions: function(){
var self = this;
$.post("/api/libraries/datasets/" + self.id + "/permissions?action=remove_restrictions")
$.post( ( window.galaxy_config ? galaxy_config.root : '/' ) + "api/libraries/datasets/" + self.id + "/permissions?action=remove_restrictions")
.done(function(fetched_permissions) {
self.model.set({is_unrestricted:true});
self.showPermissions({fetched_permissions:fetched_permissions})
@@ -478,7 +478,7 @@ var LibraryDatasetView = Backbone.View.extend({
modify_ids.push(modify_roles[i].id);
};
$.post("/api/libraries/datasets/" + self.id + "/permissions?action=set_permissions", { 'access_ids[]': access_ids, 'manage_ids[]': manage_ids, 'modify_ids[]': modify_ids, } )
$.post( ( window.galaxy_config ? galaxy_config.root : '/' ) + "api/libraries/datasets/" + self.id + "/permissions?action=set_permissions", { 'access_ids[]': access_ids, 'manage_ids[]': manage_ids, 'modify_ids[]': modify_ids, } )
.done(function(fetched_permissions){
//fetch dataset again
self.showPermissions({fetched_permissions:fetched_permissions})
static/scripts/mvc/library/library-folder-view.js
+3 -3
View File
@@ -81,7 +81,7 @@ var FolderView = Backbone.View.extend({
var self = this;
if (this.options.fetched_permissions === undefined){
$.get( "/api/folders/" + self.id + "/permissions?scope=current").done(function(fetched_permissions) {
$.get( ( window.galaxy_config ? galaxy_config.root : '/' ) + "api/folders/" + self.id + "/permissions?scope=current").done(function(fetched_permissions) {
self.prepareSelectBoxes({fetched_permissions:fetched_permissions});
}).fail(function(){
mod_toastr.error('An error occurred while attempting to fetch folder permissions.');
@@ -125,7 +125,7 @@ var FolderView = Backbone.View.extend({
placeholder: 'Click to select a role',
container: self.$el.find('#' + id),
ajax: {
url: "/api/folders/" + self.id + "/permissions?scope=available",
url: ( window.galaxy_config ? galaxy_config.root : '/' ) + "api/folders/" + self.id + "/permissions?scope=available",
dataType: 'json',
quietMillis: 100,
data: function (term, page) { // page is the one-based page number tracked by Select2
@@ -195,7 +195,7 @@ var FolderView = Backbone.View.extend({
var manage_ids = this._extractIds(this.manageSelectObject.$el.select2('data'));
var modify_ids = this._extractIds(this.modifySelectObject.$el.select2('data'));
$.post("/api/folders/" + self.id + "/permissions?action=set_permissions", { 'add_ids[]': add_ids, 'manage_ids[]': manage_ids, 'modify_ids[]': modify_ids, } )
$.post( ( window.galaxy_config ? galaxy_config.root : '/' ) + "api/folders/" + self.id + "/permissions?action=set_permissions", { 'add_ids[]': add_ids, 'manage_ids[]': manage_ids, 'modify_ids[]': modify_ids, } )
.done(function(fetched_permissions){
//fetch dataset again
self.showPermissions({fetched_permissions:fetched_permissions})
static/scripts/mvc/library/library-foldertoolbar-view.js
+6 -6
View File
@@ -294,7 +294,7 @@ var FolderToolbarView = Backbone.View.extend({
dataset_ids.push( this.parentElement.parentElement.id );
}
} );
var url = '/api/libraries/datasets/download/' + format;
var url = ( window.galaxy_config ? galaxy_config.root : '/' ) + 'api/libraries/datasets/download/' + format;
var data = { 'ld_ids' : dataset_ids };
this.processDownload( url, data, 'get' );
},
@@ -386,7 +386,7 @@ var FolderToolbarView = Backbone.View.extend({
fetchExtAndGenomes: function(){
var that = this;
mod_utils.get({
url : galaxy_config.root + "api/datatypes?extension_only=False",
url : ( window.galaxy_config ? galaxy_config.root : '/' ) + "api/datatypes?extension_only=False",
success : function( datatypes ) {
for (key in datatypes) {
that.list_extensions.push({
@@ -403,7 +403,7 @@ var FolderToolbarView = Backbone.View.extend({
}
});
mod_utils.get({
url: galaxy_config.root + "api/genomes",
url: ( window.galaxy_config ? galaxy_config.root : '/' ) + "api/genomes",
success: function( genomes ) {
for ( key in genomes ) {
that.list_genomes.push({
@@ -689,7 +689,7 @@ var FolderToolbarView = Backbone.View.extend({
for ( var i = history_dataset_ids.length - 1; i >= 0; i-- ) {
history_dataset_id = history_dataset_ids[i];
var folder_item = new mod_library_model.Item();
folder_item.url = '/api/folders/' + this.options.id + '/contents';
folder_item.url = ( window.galaxy_config ? galaxy_config.root : '/' ) + 'api/folders/' + this.options.id + '/contents';
folder_item.set( { 'from_hda_id':history_dataset_id } );
hdas_to_add.push( folder_item );
}
@@ -749,7 +749,7 @@ var FolderToolbarView = Backbone.View.extend({
}
return true;
}
var promise = $.when( $.post( '/api/libraries/datasets?encoded_folder_id=' + that.id +
var promise = $.when( $.post( ( window.galaxy_config ? galaxy_config.root : '/' ) + 'api/libraries/datasets?encoded_folder_id=' + that.id +
'&source=' + options.source +
'&path=' + popped_item +
'&file_type=' + options.file_type +
@@ -788,7 +788,7 @@ var FolderToolbarView = Backbone.View.extend({
}
return true;
}
var promise = $.when( $.post( '/api/libraries/datasets?encoded_folder_id=' + that.id +
var promise = $.when( $.post( ( window.galaxy_config ? galaxy_config.root : '/' ) + 'api/libraries/datasets?encoded_folder_id=' + that.id +
'&source=' + options.source +
'&path=' + popped_item +
'&preserve_dirs=' + options.preserve_dirs +
static/scripts/mvc/library/library-library-view.js
+5 -5
View File
@@ -87,7 +87,7 @@ var LibraryView = Backbone.View.extend({
var self = this;
if (this.options.fetched_permissions === undefined){
$.get( "/api/libraries/" + self.id + "/permissions?scope=current").done(function(fetched_permissions) {
$.get( ( window.galaxy_config ? galaxy_config.root : '/' ) + "api/libraries/" + self.id + "/permissions?scope=current").done(function(fetched_permissions) {
self.prepareSelectBoxes({fetched_permissions:fetched_permissions});
}).fail(function(){
mod_toastr.error('An error occurred while attempting to fetch library permissions.');
@@ -134,7 +134,7 @@ var LibraryView = Backbone.View.extend({
placeholder: 'Click to select a role',
container: self.$el.find('#' + id),
ajax: {
url: "/api/libraries/" + self.id + "/permissions?scope=available&is_library_access=" + is_library_access,
url: ( window.galaxy_config ? galaxy_config.root : '/' ) + "api/libraries/" + self.id + "/permissions?scope=available&is_library_access=" + is_library_access,
dataType: 'json',
quietMillis: 100,
data: function (term, page) { // page is the one-based page number tracked by Select2
@@ -193,7 +193,7 @@ var LibraryView = Backbone.View.extend({
makeDatasetPrivate: function(){
var self = this;
$.post("/api/libraries/datasets/" + self.id + "/permissions?action=make_private").done(function(fetched_permissions) {
$.post( ( window.galaxy_config ? galaxy_config.root : '/' ) + "api/libraries/datasets/" + self.id + "/permissions?action=make_private").done(function(fetched_permissions) {
self.model.set({is_unrestricted:false});
self.showPermissions({fetched_permissions:fetched_permissions})
mod_toastr.success('The dataset is now private to you.');
@@ -204,7 +204,7 @@ var LibraryView = Backbone.View.extend({
removeDatasetRestrictions: function(){
var self = this;
$.post("/api/libraries/datasets/" + self.id + "/permissions?action=remove_restrictions")
$.post( ( window.galaxy_config ? galaxy_config.root : '/' ) + "api/libraries/datasets/" + self.id + "/permissions?action=remove_restrictions")
.done(function(fetched_permissions) {
self.model.set({is_unrestricted:true});
self.showPermissions({fetched_permissions:fetched_permissions})
@@ -230,7 +230,7 @@ var LibraryView = Backbone.View.extend({
var manage_ids = this._extractIds(this.manageSelectObject.$el.select2('data'));
var modify_ids = this._extractIds(this.modifySelectObject.$el.select2('data'));
$.post("/api/libraries/" + self.id + "/permissions?action=set_permissions", { 'access_ids[]': access_ids, 'add_ids[]': add_ids, 'manage_ids[]': manage_ids, 'modify_ids[]': modify_ids, } )
$.post( ( window.galaxy_config ? galaxy_config.root : '/' ) + "api/libraries/" + self.id + "/permissions?action=set_permissions", { 'access_ids[]': access_ids, 'add_ids[]': add_ids, 'manage_ids[]': manage_ids, 'modify_ids[]': modify_ids, } )
.done(function(fetched_permissions){
//fetch dataset again
self.showPermissions({fetched_permissions:fetched_permissions})
static/scripts/mvc/library/library-model.js
+11 -11
View File
@@ -4,7 +4,7 @@ define([], function() {
// LIBRARY RELATED MODELS
var Library = Backbone.Model.extend({
urlRoot: '/api/libraries/',
urlRoot: ( window.galaxy_config ? galaxy_config.root : '/' ) + 'api/libraries/',
/** based on show_deleted would this lib show in the list of lib's?
* @param {Boolean} show_deleted are we including deleted libraries?
@@ -19,7 +19,7 @@ define([], function() {
});
var Libraries = Backbone.Collection.extend({
url: '/api/libraries',
url: ( window.galaxy_config ? galaxy_config.root : '/' ) + 'api/libraries',
model: Library,
@@ -84,15 +84,15 @@ define([], function() {
// FOLDER RELATED MODELS
var Item = Backbone.Model.extend({
urlRoot : '/api/libraries/datasets/'
urlRoot : ( window.galaxy_config ? galaxy_config.root : '/' ) + 'api/libraries/datasets/'
});
var Ldda = Backbone.Model.extend({
urlRoot : '/api/libraries/datasets/'
urlRoot : ( window.galaxy_config ? galaxy_config.root : '/' ) + 'api/libraries/datasets/'
});
var FolderAsModel = Backbone.Model.extend({
urlRoot: '/api/folders'
urlRoot: ( window.galaxy_config ? galaxy_config.root : '/' ) + 'api/folders'
});
var Folder = Backbone.Collection.extend({
@@ -152,7 +152,7 @@ define([], function() {
var FolderContainer = Backbone.Model.extend({
defaults : {
folder : new Folder(),
urlRoot : "/api/folders/",
urlRoot : ( window.galaxy_config ? galaxy_config.root : '/' ) + 'api/folders/',
id : "unknown"
},
parse : function(obj) {
@@ -169,11 +169,11 @@ define([], function() {
// TODO UNITE
var HistoryItem = Backbone.Model.extend({
urlRoot : '/api/histories/'
urlRoot : ( window.galaxy_config ? galaxy_config.root : '/' ) + 'api/histories/'
});
var HistoryContents = Backbone.Collection.extend({
urlRoot : '/api/histories/',
urlRoot : ( window.galaxy_config ? galaxy_config.root : '/' ) + 'api/histories/',
initialize: function(options){
this.id = options.id;
},
@@ -184,11 +184,11 @@ define([], function() {
});
var GalaxyHistory = Backbone.Model.extend({
urlRoot : '/api/histories/'
urlRoot : ( window.galaxy_config ? galaxy_config.root : '/' ) + 'api/histories/'
});
var GalaxyHistories = Backbone.Collection.extend({
url : '/api/histories',
url : ( window.galaxy_config ? galaxy_config.root : '/' ) + 'api/histories',
model : GalaxyHistory
});
@@ -199,7 +199,7 @@ define([], function() {
*/
var Jstree = Backbone.Model.extend({
urlRoot: '/api/remote_files'
urlRoot: ( window.galaxy_config ? galaxy_config.root : '/' ) + 'api/remote_files'
});
return {
static/scripts/packed/mvc/library/library-dataset-view.js
+1 -1
View File
File diff suppressed because one or more lines are too long
static/scripts/packed/mvc/library/library-folder-view.js
+1 -1
View File
File diff suppressed because one or more lines are too long
static/scripts/packed/mvc/library/library-foldertoolbar-view.js
+1 -1
View File
File diff suppressed because one or more lines are too long
static/scripts/packed/mvc/library/library-library-view.js
+1 -1
View File
File diff suppressed because one or more lines are too long
static/scripts/packed/mvc/library/library-model.js
+1 -1
View File
@@ -1 +1 @@
define([],function(){var f=Backbone.Model.extend({urlRoot:"/api/libraries/",isVisible:function(n){var m=true;if((!n)&&(this.get("deleted"))){m=false}return m}});var i=Backbone.Collection.extend({url:"/api/libraries",model:f,sort_key:"name",sort_order:null,initialize:function(m){m=m||{}},getVisible:function(n,o){o=o||[];var m=new i(this.filter(function(p){return p.isVisible(n)}));return m},sortByNameAsc:function(){this.comparator=function(n,m){if(n.get("name").toLowerCase()>m.get("name").toLowerCase()){return 1}if(m.get("name").toLowerCase()>n.get("name").toLowerCase()){return -1}return 0};this.sort();return this},sortByNameDesc:function(){this.comparator=function(n,m){if(n.get("name").toLowerCase()>m.get("name").toLowerCase()){return -1}if(m.get("name").toLowerCase()>n.get("name").toLowerCase()){return 1}return 0};this.sort();return this}});var g=Backbone.Model.extend({urlRoot:"/api/libraries/datasets/"});var l=Backbone.Model.extend({urlRoot:"/api/libraries/datasets/"});var a=Backbone.Model.extend({urlRoot:"/api/folders"});var c=Backbone.Collection.extend({model:g,sortByNameAsc:function(){this.comparator=function(n,m){if(n.get("type")===m.get("type")){if(n.get("name").toLowerCase()>m.get("name").toLowerCase()){return 1}if(m.get("name").toLowerCase()>n.get("name").toLowerCase()){return -1}return 0}else{if(n.get("type")==="folder"){return -1}else{return 1}}};this.sort();return this},sortByNameDesc:function(){this.comparator=function(n,m){if(n.get("type")===m.get("type")){if(n.get("name").toLowerCase()>m.get("name").toLowerCase()){return -1}if(m.get("name").toLowerCase()>n.get("name").toLowerCase()){return 1}return 0}else{if(n.get("type")==="folder"){return -1}else{return 1}}};this.sort();return this}});var e=Backbone.Model.extend({defaults:{folder:new c(),urlRoot:"/api/folders/",id:"unknown"},parse:function(m){this.get("folder").reset(m.folder_contents);return m}});var b=Backbone.Model.extend({urlRoot:"/api/histories/"});var d=Backbone.Collection.extend({urlRoot:"/api/histories/",initialize:function(m){this.id=m.id},url:function(){return this.urlRoot+this.id+"/contents"},model:b});var h=Backbone.Model.extend({urlRoot:"/api/histories/"});var k=Backbone.Collection.extend({url:"/api/histories",model:h});var j=Backbone.Model.extend({urlRoot:"/api/remote_files"});return{Library:f,FolderAsModel:a,Libraries:i,Item:g,Ldda:l,Folder:c,FolderContainer:e,HistoryItem:b,HistoryContents:d,GalaxyHistory:h,GalaxyHistories:k,Jstree:j}});
define([],function(){var f=Backbone.Model.extend({urlRoot:(window.galaxy_config?galaxy_config.root:"/")+"api/libraries/",isVisible:function(n){var m=true;if((!n)&&(this.get("deleted"))){m=false}return m}});var i=Backbone.Collection.extend({url:(window.galaxy_config?galaxy_config.root:"/")+"api/libraries",model:f,sort_key:"name",sort_order:null,initialize:function(m){m=m||{}},getVisible:function(n,o){o=o||[];var m=new i(this.filter(function(p){return p.isVisible(n)}));return m},sortByNameAsc:function(){this.comparator=function(n,m){if(n.get("name").toLowerCase()>m.get("name").toLowerCase()){return 1}if(m.get("name").toLowerCase()>n.get("name").toLowerCase()){return -1}return 0};this.sort();return this},sortByNameDesc:function(){this.comparator=function(n,m){if(n.get("name").toLowerCase()>m.get("name").toLowerCase()){return -1}if(m.get("name").toLowerCase()>n.get("name").toLowerCase()){return 1}return 0};this.sort();return this}});var g=Backbone.Model.extend({urlRoot:(window.galaxy_config?galaxy_config.root:"/")+"api/libraries/datasets/"});var l=Backbone.Model.extend({urlRoot:(window.galaxy_config?galaxy_config.root:"/")+"api/libraries/datasets/"});var a=Backbone.Model.extend({urlRoot:(window.galaxy_config?galaxy_config.root:"/")+"api/folders"});var c=Backbone.Collection.extend({model:g,sortByNameAsc:function(){this.comparator=function(n,m){if(n.get("type")===m.get("type")){if(n.get("name").toLowerCase()>m.get("name").toLowerCase()){return 1}if(m.get("name").toLowerCase()>n.get("name").toLowerCase()){return -1}return 0}else{if(n.get("type")==="folder"){return -1}else{return 1}}};this.sort();return this},sortByNameDesc:function(){this.comparator=function(n,m){if(n.get("type")===m.get("type")){if(n.get("name").toLowerCase()>m.get("name").toLowerCase()){return -1}if(m.get("name").toLowerCase()>n.get("name").toLowerCase()){return 1}return 0}else{if(n.get("type")==="folder"){return -1}else{return 1}}};this.sort();return this}});var e=Backbone.Model.extend({defaults:{folder:new c(),urlRoot:(window.galaxy_config?galaxy_config.root:"/")+"api/folders/",id:"unknown"},parse:function(m){this.get("folder").reset(m.folder_contents);return m}});var b=Backbone.Model.extend({urlRoot:(window.galaxy_config?galaxy_config.root:"/")+"api/histories/"});var d=Backbone.Collection.extend({urlRoot:(window.galaxy_config?galaxy_config.root:"/")+"api/histories/",initialize:function(m){this.id=m.id},url:function(){return this.urlRoot+this.id+"/contents"},model:b});var h=Backbone.Model.extend({urlRoot:(window.galaxy_config?galaxy_config.root:"/")+"api/histories/"});var k=Backbone.Collection.extend({url:(window.galaxy_config?galaxy_config.root:"/")+"api/histories",model:h});var j=Backbone.Model.extend({urlRoot:(window.galaxy_config?galaxy_config.root:"/")+"api/remote_files"});return{Library:f,FolderAsModel:a,Libraries:i,Item:g,Ldda:l,Folder:c,FolderContainer:e,HistoryItem:b,HistoryContents:d,GalaxyHistory:h,GalaxyHistories:k,Jstree:j}});