Remove async flag handling from grid client

galaxyproject · Dec 10, 2017 · e32d965 · e32d965
1 parent d12e656
commit e32d965
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 22 deletions.
diff --git a/client/galaxy/scripts/mvc/grid/grid-model.js b/client/galaxy/scripts/mvc/grid/grid-model.js
@@ -17,13 +17,6 @@ export default Backbone.Model.extend({
         item_ids: undefined
     },
 
-    /**
-     * Return true if operation can be done asynchronously.
-     */
-    can_async_op: function(op) {
-        return _.indexOf(this.attributes.async_ops, op) !== -1;
-    },
-
     /**
      * Add filtering criterion.
      */

diff --git a/client/galaxy/scripts/mvc/grid/grid-view.js b/client/galaxy/scripts/mvc/grid/grid-view.js
@@ -570,10 +570,8 @@ export default Backbone.View.extend({
                 window.top.location = `${href}?${$.param(this.grid.get_url_data())}`;
             } else if (target == "center") {
                 $("#galaxy_main").attr("src", `${href}?${$.param(this.grid.get_url_data())}`);
-            } else if (this.grid.can_async_op(operation) || this.dict_format) {
-                this.update_grid();
             } else {
-                this.go_to(target, href);
+                this.update_grid();
             }
 
             // done
@@ -587,22 +585,14 @@ export default Backbone.View.extend({
         }
 
         // refresh grid
-        if (this.grid.get("async") || this.dict_format) {
-            this.update_grid();
-        } else {
-            this.go_to(target, href);
-        }
+        this.update_grid();
 
         // done
         return false;
     },
 
     // go to url
     go_to: function(target, href) {
-        // get aysnc status
-        var async = this.grid.get("async");
-        this.grid.set("async", false);
-
         // get slide status
         var advanced_search = this.$el.find("#advanced-search").is(":visible");
         this.grid.set("advanced_search", advanced_search);
@@ -615,8 +605,7 @@ export default Backbone.View.extend({
         // clear grid of transient request attributes.
         this.grid.set({
             operation: undefined,
-            item_ids: undefined,
-            async: async
+            item_ids: undefined
         });
         switch (target) {
             case "center":

diff --git a/lib/galaxy/web/framework/helpers/grids.py b/lib/galaxy/web/framework/helpers/grids.py
@@ -236,7 +236,6 @@ def loads_recurse(item):
         context = text_type(self.__class__.__name__)
         params = cur_filter_dict.copy()
         params['sort'] = sort_key
-        params['async'] = ('async' in kwargs)
 
         # TODO:??
         # commenting this out; when this fn calls session.add( action ) and session.flush the query from this fn