Remove unused preserve state attribute from grids

lib/galaxy/web/framework/helpers/grids.py

@@ -32,7 +32,6 @@ class Grid(object):
     # Any columns that are filterable (either standard or advanced) should have a default value set in the default filter.
     default_filter = {}
     default_sort_key = None
-    preserve_state = False
     use_paging = False
     num_rows_per_page = 25
     num_page_links = 10
@@ -69,14 +68,6 @@ def __call__(self, trans, **kwargs):
             # default_filter is a dictionary that provides a default set of filters based on the grid's columns.
             base_filter = self.default_filter.copy()
         base_sort_key = self.default_sort_key
-        if self.preserve_state:
-            pref_name = text_type(self.__class__.__name__ + self.cur_filter_pref_name)
-            if pref_name in trans.get_user().preferences:
-                saved_filter = loads(trans.get_user().preferences[pref_name])
-                base_filter.update(saved_filter)
-            pref_name = text_type(self.__class__.__name__ + self.cur_sort_key_pref_name)
-            if pref_name in trans.get_user().preferences:
-                base_sort_key = loads(trans.get_user().preferences[pref_name])
         # Build initial query
         query = self.build_initial_query(trans, **kwargs)
         query = self.apply_query_filter(trans, query, **kwargs)
@@ -224,14 +215,7 @@ def loads_recurse(item):
         # There are some places in grid templates where it's useful for a grid
         # to have its current filter.
         self.cur_filter_dict = cur_filter_dict
-        # Preserve grid state: save current filter and sort key.
-        if self.preserve_state:
-            pref_name = text_type(self.__class__.__name__ + self.cur_filter_pref_name)
-            trans.get_user().preferences[pref_name] = text_type(dumps(cur_filter_dict))
-            if sort_key:
-                pref_name = text_type(self.__class__.__name__ + self.cur_sort_key_pref_name)
-                trans.get_user().preferences[pref_name] = text_type(dumps(sort_key))
-            trans.sa_session.flush()
+
         # Log grid view.
         context = text_type(self.__class__.__name__)
         params = cur_filter_dict.copy()

lib/galaxy/webapps/galaxy/controllers/admin.py

@@ -154,7 +154,6 @@ def get_value(self, trans, grid, user):
         grids.GridColumnFilter("All", args=dict(deleted='All'))
     ]
     num_rows_per_page = 50
-    preserve_state = False
     use_paging = True
 
     def get_current_item(self, trans, **kwargs):
@@ -255,7 +254,6 @@ def get_value(self, trans, grid, role):
         grids.GridColumnFilter("All", args=dict(deleted='All'))
     ]
     num_rows_per_page = 50
-    preserve_state = False
     use_paging = True
 
     def apply_query_filter(self, trans, query, **kwargs):
@@ -335,7 +333,6 @@ def get_value(self, trans, grid, group):
         grids.GridColumnFilter("All", args=dict(deleted='All'))
     ]
     num_rows_per_page = 50
-    preserve_state = False
     use_paging = True
 
 
@@ -447,7 +444,6 @@ def get_value(self, trans, grid, quota):
         grids.GridColumnFilter("All", args=dict(deleted='All'))
     ]
     num_rows_per_page = 50
-    preserve_state = False
     use_paging = True
 
 
@@ -499,7 +495,6 @@ def get_value(self, trans, grid, tool_version):
     standard_filters = []
     default_filter = {}
     num_rows_per_page = 50
-    preserve_state = False
     use_paging = True
 
     def build_initial_query(self, trans, **kwd):

lib/galaxy/webapps/galaxy/controllers/dataset.py

@@ -84,7 +84,6 @@ def get_accepted_filters(self):
     ]
     standard_filters = []
     default_filter = dict(name="All", deleted="False", tags="All")
-    preserve_state = False
     use_paging = True
     num_rows_per_page = 50
 

lib/galaxy/webapps/galaxy/controllers/forms.py

@@ -39,7 +39,6 @@ def get_value(self, trans, grid, user):
     model_class = model.FormDefinitionCurrent
     default_sort_key = "-update_time"
     num_rows_per_page = 50
-    preserve_state = True
     use_paging = True
     default_filter = dict(deleted="False")
     columns = [

lib/galaxy/webapps/galaxy/controllers/history.py

@@ -130,7 +130,6 @@ def sort(self, trans, query, ascending, column_name=None):
     ]
     default_filter = dict(name="All", deleted="False", tags="All", sharing="All")
     num_rows_per_page = 15
-    preserve_state = False
     use_paging = True
     info_text = "Histories that have been deleted for more than a time period specified by the Galaxy administrator(s) may be permanently deleted."
 

lib/galaxy/webapps/reports/controllers/jobs.py

@@ -222,7 +222,6 @@ def filter(self, trans, user, query, column_filter):
     standard_filters = []
     default_filter = {'specified_date': 'All'}
     num_rows_per_page = 50
-    preserve_state = False
     use_paging = True
 
     def build_initial_query(self, trans, **kwd):

lib/galaxy/webapps/reports/controllers/workflows.py

@@ -112,7 +112,6 @@ def filter(self, trans, user, query, column_filter):
     standard_filters = []
     default_filter = {'specified_date': 'All'}
     num_rows_per_page = 50
-    preserve_state = False
     use_paging = True
 
     def build_initial_query(self, trans, **kwd):

lib/galaxy/webapps/reports/framework/grids.py

@@ -35,7 +35,6 @@ class Grid(object):
     # Any columns that are filterable (either standard or advanced) should have a default value set in the default filter.
     default_filter = {}
     default_sort_key = None
-    preserve_state = False
     use_paging = False
     num_rows_per_page = 25
     num_page_links = 10
@@ -72,14 +71,6 @@ def __call__(self, trans, **kwargs):
             # default_filter is a dictionary that provides a default set of filters based on the grid's columns.
             base_filter = self.default_filter.copy()
         base_sort_key = self.default_sort_key
-        if self.preserve_state:
-            pref_name = text_type(self.__class__.__name__ + self.cur_filter_pref_name)
-            if pref_name in trans.get_user().preferences:
-                saved_filter = loads(trans.get_user().preferences[pref_name])
-                base_filter.update(saved_filter)
-            pref_name = text_type(self.__class__.__name__ + self.cur_sort_key_pref_name)
-            if pref_name in trans.get_user().preferences:
-                base_sort_key = loads(trans.get_user().preferences[pref_name])
         # Build initial query
         query = self.build_initial_query(trans, **kwargs)
         query = self.apply_query_filter(trans, query, **kwargs)
@@ -227,14 +218,7 @@ def loads_recurse(item):
         # There are some places in grid templates where it's useful for a grid
         # to have its current filter.
         self.cur_filter_dict = cur_filter_dict
-        # Preserve grid state: save current filter and sort key.
-        if self.preserve_state:
-            pref_name = text_type(self.__class__.__name__ + self.cur_filter_pref_name)
-            trans.get_user().preferences[pref_name] = text_type(dumps(cur_filter_dict))
-            if sort_key:
-                pref_name = text_type(self.__class__.__name__ + self.cur_sort_key_pref_name)
-                trans.get_user().preferences[pref_name] = text_type(dumps(sort_key))
-            trans.sa_session.flush()
+
         # Log grid view.
         context = text_type(self.__class__.__name__)
         params = cur_filter_dict.copy()

lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py

@@ -215,7 +215,6 @@ def get_accepted_filters(self):
     standard_filters = []
     default_filter = dict(deleted="False")
     num_rows_per_page = 50
-    preserve_state = False
     use_paging = False
 
     def build_initial_query(self, trans, **kwd):

lib/tool_shed/grids/repository_grids.py

@@ -62,7 +62,6 @@ def get_value(self, trans, grid, category):
     operations = []
     standard_filters = []
     num_rows_per_page = 50
-    preserve_state = False
     use_paging = False
 
 
@@ -236,7 +235,6 @@ def get_value(self, trans, grid, repository):
     standard_filters = []
     default_filter = dict(deleted="False")
     num_rows_per_page = 50
-    preserve_state = False
     use_paging = False
 
     def build_initial_query(self, trans, **kwd):
@@ -358,7 +356,6 @@ def get_value(self, trans, grid, repository_metadata):
     standard_filters = []
     default_filter = {}
     num_rows_per_page = 50
-    preserve_state = False
     use_paging = False
 
     def build_initial_query(self, trans, **kwd):
@@ -457,7 +454,6 @@ class RepositoriesByUserGrid(RepositoryGrid):
     standard_filters = []
     default_filter = dict(deleted="False")
     num_rows_per_page = 50
-    preserve_state = False
     use_paging = False
 
     def build_initial_query(self, trans, **kwd):
@@ -978,7 +974,6 @@ def get_value(self, trans, grid, repository_metadata):
     standard_filters = []
     default_filter = dict(malicious="False")
     num_rows_per_page = 50
-    preserve_state = False
     use_paging = False
 
     def build_initial_query(self, trans, **kwd):
@@ -1298,7 +1293,6 @@ def get_value(self, trans, grid, category):
     operations = []
     standard_filters = []
     num_rows_per_page = 50
-    preserve_state = False
     use_paging = False
 
 

lib/tool_shed/grids/repository_review_grids.py

@@ -45,7 +45,6 @@ def get_value(self, trans, grid, component):
     operations = []
     standard_filters = []
     num_rows_per_page = 50
-    preserve_state = False
     use_paging = False
 
 
@@ -349,7 +348,6 @@ def get_value(self, trans, grid, review):
     ]
     standard_filters = []
     num_rows_per_page = 50
-    preserve_state = False
     use_paging = False
 
     def build_initial_query(self, trans, **kwd):