Skip to content

Commit

Permalink
refactor few functionas and rename variables
Browse files Browse the repository at this point in the history
  • Loading branch information
martenson committed Sep 13, 2017
1 parent e769602 commit 1f69ae5
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 25 deletions.
12 changes: 7 additions & 5 deletions client/galaxy/scripts/mvc/library/library-dataset-view.js
Expand Up @@ -266,11 +266,13 @@ var LibraryDatasetView = Backbone.View.extend({
var template = this.templateDatasetPermissions();
this.$el.html(template({item: this.model, is_admin: is_admin}));
var self = this;
$.get( Galaxy.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.');
});
$.get(Galaxy.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.');
});
$("#center [data-toggle]").tooltip();
$("#center").css('overflow','auto');
},
Expand Down
32 changes: 15 additions & 17 deletions client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js
Expand Up @@ -942,8 +942,8 @@ var FolderToolbarView = Backbone.View.extend({
chainCallDeletingItems: function( items_to_delete ){
var self = this;
this.deleted_items = new mod_library_model.Folder();
var popped_item = items_to_delete.pop();
if ( typeof popped_item === "undefined" ) {
var item_to_delete = items_to_delete.pop();
if ( typeof item_to_delete === "undefined" ) {
if ( this.options.chain_call_control.failed_number === 0 ){
mod_toastr.success( 'Selected items were deleted.' );
} else if ( this.options.chain_call_control.failed_number === this.options.chain_call_control.total_number ){
Expand All @@ -954,10 +954,9 @@ var FolderToolbarView = Backbone.View.extend({
Galaxy.modal.hide();
return this.deleted_items;
}
var promise = $.when( popped_item.destroy() );

promise.done( function( item ){
Galaxy.libraries.folderListView.collection.remove( popped_item.id );
item_to_delete.destroy()
.done( function( item ){
Galaxy.libraries.folderListView.collection.remove( item_to_delete.id );
self.updateProgress();
// add the deleted item to collection, triggers rendering
if ( Galaxy.libraries.folderListView.options.include_deleted ){
Expand All @@ -974,11 +973,11 @@ var FolderToolbarView = Backbone.View.extend({
}
self.chainCallDeletingItems( items_to_delete );
})
.fail( function(){
self.options.chain_call_control.failed_number += 1;
self.updateProgress();
self.chainCallDeletingItems( items_to_delete );
});
.fail( function(){
self.options.chain_call_control.failed_number += 1;
self.updateProgress();
self.chainCallDeletingItems( items_to_delete );
});
},

/**
Expand All @@ -996,8 +995,10 @@ var FolderToolbarView = Backbone.View.extend({
* Delete the selected items. Atomic. One by one.
*/
deleteSelectedItems: function(){
var checkedValues = $('#folder_table').find(':checked');
if(checkedValues.length === 0){
var dataset_ids = [];
var folder_ids = [];
var $checkedValues = $('#folder_table').find(':checked');
if($checkedValues.length === 0){
mod_toastr.info('You must select at least one item for deletion.');
} else {
var template = this.templateDeletingItemsProgressBar();
Expand All @@ -1013,10 +1014,7 @@ var FolderToolbarView = Backbone.View.extend({
// init the control counters
this.options.chain_call_control.total_number = 0;
this.options.chain_call_control.failed_number = 0;

var dataset_ids = [];
var folder_ids = [];
checkedValues.each(function(){
$checkedValues.each(function(){
var row_id = $(this).closest('tr').data('id');
if (row_id !== undefined) {
if (row_id.substring(0,1) == 'F'){
Expand Down
2 changes: 1 addition & 1 deletion static/maps/mvc/library/library-dataset-view.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion static/maps/mvc/library/library-foldertoolbar-view.js.map

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions static/scripts/bundled/analysis.bundled.js.map

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions static/scripts/bundled/libs.bundled.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion static/scripts/mvc/library/library-foldertoolbar-view.js

Large diffs are not rendered by default.

0 comments on commit 1f69ae5

Please sign in to comment.