Merge pull request #4356 from galaxyproject/revert-4355-patch-wrong-f…

…older-id Revert "[release_17.05] Patch bug preventing creation of dataset library folders"
galaxyproject · Jul 28, 2017 · 163e4eb · 163e4eb
2 parents a222978 + ecfb90e
commit 163e4eb
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 12 deletions.
diff --git a/client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js b/client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js
@@ -162,11 +162,7 @@ var FolderToolbarView = Backbone.View.extend({
       if (this.validate_new_folder(folderDetails)){
           var folder = new mod_library_model.FolderAsModel();
           url_items = Backbone.history.fragment.split('/');
-          if(url_items.indexOf('page') > -1){
-            current_folder_id = url_items[url_items.length-3];
-          }else {
-            current_folder_id = url_items[url_items.length-1];
-          }
+          current_folder_id = url_items[url_items.length-1];
           folder.url = folder.urlRoot + current_folder_id ;
 
           folder.save(folderDetails, {

diff --git a/static/maps/mvc/job/job-params.js.map b/static/maps/mvc/job/job-params.js.map
diff --git a/static/maps/mvc/library/library-foldertoolbar-view.js.map b/static/maps/mvc/library/library-foldertoolbar-view.js.map
diff --git a/static/scripts/bundled/analysis.bundled.js.map b/static/scripts/bundled/analysis.bundled.js.map
diff --git a/static/scripts/bundled/libs.bundled.js.map b/static/scripts/bundled/libs.bundled.js.map
diff --git a/static/scripts/mvc/job/job-params.js b/static/scripts/mvc/job/job-params.js
diff --git a/static/scripts/mvc/library/library-foldertoolbar-view.js b/static/scripts/mvc/library/library-foldertoolbar-view.js