Fixes for deleting histories broken in 1cc57b1

galaxyproject · Nov 21, 2016 · 548d3e6 · 548d3e6
1 parent 3f27777
commit 548d3e6
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/client/galaxy/scripts/mvc/history/options-menu.js b/client/galaxy/scripts/mvc/history/options-menu.js
@@ -60,15 +60,23 @@ var menu = [
     },
     {
         html    : _l( 'Delete' ),
-        confirm : _l( 'Really delete the current history?' ),
-        href    : 'history/delete_current',
+        anon    : true,
+        func    : function() {
+            if( Galaxy && Galaxy.currHistoryPanel && confirm( _l( 'Really delete the current history?' ) ) ){
+                galaxy_main.window.location.href = 'history/delete?id=' + Galaxy.currHistoryPanel.model.id;
+            }
+        },
     },
     {
         html    : _l( 'Delete Permanently' ),
-        confirm : _l( 'Really delete the current history permanently? This cannot be undone.' ),
-        href    : 'history/delete_current?purge=True',
         purge   : true,
         anon    : true,
+        func    : function() {
+            if( Galaxy && Galaxy.currHistoryPanel
+            &&  confirm( _l( 'Really delete the current history permanently? This cannot be undone.' ) ) ){
+                galaxy_main.window.location.href = 'history/delete?purge=True&id=' + Galaxy.currHistoryPanel.model.id;
+            }
+        },
     },