Merge pull request #3074 from martenson/fix-libraries-prefix

[16.07] Fix libraries prefix

client/galaxy/scripts/mvc/library/library-dataset-view.js

@@ -186,7 +186,7 @@ var LibraryDatasetView = Backbone.View.extend({
     this.histories.fetch({
       success: function (histories){
         if (histories.length === 0){
-          mod_toastr.warning('You have to create history first. Click this to do so.', '', {onclick: function() {window.location='/';}});
+          mod_toastr.warning('You have to create history first. Click this to do so.', '', {onclick: function() {window.location=Galaxy.root;}});
         } else {
           callback(self);
         }
@@ -233,7 +233,7 @@ var LibraryDatasetView = Backbone.View.extend({
     historyItem.save({ content : this.id, source : 'library' }, {
       success : function(){
         Galaxy.modal.hide();
-        mod_toastr.success('Dataset imported. Click this to start analyzing it.', '', {onclick: function() {window.location='/';}});
+        mod_toastr.success('Dataset imported. Click this to start analyzing it.', '', {onclick: function() {window.location=Galaxy.root;}});
       },
       error : function(model, response){
         if (typeof response.responseJSON !== "undefined"){

client/galaxy/scripts/mvc/library/library-folderrow-view.js

@@ -112,7 +112,7 @@ var FolderRowView = Backbone.View.extend({
           Galaxy.libraries.folderListView.collection.sortByNameAsc();
           mod_toastr.success('Dataset undeleted. Click this to see it.', '', {onclick: function() {
             var folder_id = that.model.get('folder_id');
-            window.location='#folders/' + folder_id + '/datasets/' + that.id;
+            window.location = Galaxy.root + 'library/list#folders/' + folder_id + '/datasets/' + that.id;
           }});
         },
         error : function(model, response){

client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js

@@ -764,11 +764,11 @@ var FolderToolbarView = Backbone.View.extend({
     var popped_item = history_item_set.pop();
     if ( typeof popped_item == "undefined" ) {
       if ( this.options.chain_call_control.failed_number === 0 ){
-        mod_toastr.success( 'Selected datasets imported into history. Click this to start analyzing it.', '', { onclick: function() { window.location='/' } } );
+        mod_toastr.success( 'Selected datasets imported into history. Click this to start analyzing it.', '', { onclick: function() { window.location=Galaxy.root } } );
       } else if ( this.options.chain_call_control.failed_number === this.options.chain_call_control.total_number ){
         mod_toastr.error( 'There was an error and no datasets were imported into history.' );
       } else if ( this.options.chain_call_control.failed_number < this.options.chain_call_control.total_number ){
-        mod_toastr.warning( 'Some of the datasets could not be imported into history. Click this to see what was imported.', '', { onclick: function() { window.location='/' } } );
+        mod_toastr.warning( 'Some of the datasets could not be imported into history. Click this to see what was imported.', '', { onclick: function() { window.location=Galaxy.root } } );
       }
       Galaxy.modal.hide();
       return true;