From efbd02743ed3be506c608662ae6e649f1695d675 Mon Sep 17 00:00:00 2001 From: guerler Date: Sun, 10 Dec 2017 11:00:25 -0500 Subject: [PATCH] Remove dict format from controllers --- lib/galaxy/webapps/galaxy/controllers/admin.py | 5 ----- lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py | 1 - lib/galaxy/webapps/galaxy/controllers/dataset.py | 1 - lib/galaxy/webapps/galaxy/controllers/forms.py | 1 - lib/galaxy/webapps/galaxy/controllers/history.py | 3 --- lib/galaxy/webapps/galaxy/controllers/page.py | 7 ------- lib/galaxy/webapps/galaxy/controllers/visualization.py | 6 ------ lib/galaxy/webapps/galaxy/controllers/workflow.py | 1 - 8 files changed, 25 deletions(-) diff --git a/lib/galaxy/webapps/galaxy/controllers/admin.py b/lib/galaxy/webapps/galaxy/controllers/admin.py index cc72def5d578..3cedb29badb2 100644 --- a/lib/galaxy/webapps/galaxy/controllers/admin.py +++ b/lib/galaxy/webapps/galaxy/controllers/admin.py @@ -559,7 +559,6 @@ def users_list(self, trans, **kwd): if message and status: kwd['message'] = util.sanitize_text(message) kwd['status'] = status - kwd['dict_format'] = True return self.user_list_grid(trans, **kwd) @web.expose_api @@ -592,7 +591,6 @@ def quotas_list(self, trans, payload=None, **kwargs): if message: kwargs['message'] = util.sanitize_text(message) kwargs['status'] = status or 'done' - kwargs['dict_format'] = True return self.quota_list_grid(trans, **kwargs) @web.expose_api @@ -902,7 +900,6 @@ def center(self, trans, **kwd): @web.expose_api @web.require_admin def tool_versions_list(self, trans, **kwd): - kwd['dict_format'] = True return self.tool_version_list_grid(trans, **kwd) @web.expose @@ -923,7 +920,6 @@ def roles_list(self, trans, **kwargs): message, status = self._undelete_role(trans, ids) elif operation == 'purge': message, status = self._purge_role(trans, ids) - kwargs['dict_format'] = True if message and status: kwargs['message'] = util.sanitize_text(message) kwargs['status'] = status @@ -1168,7 +1164,6 @@ def groups_list(self, trans, **kwargs): message, status = self._undelete_group(trans, ids) elif operation == 'purge': message, status = self._purge_group(trans, ids) - kwargs['dict_format'] = True if message and status: kwargs['message'] = util.sanitize_text(message) kwargs['status'] = status diff --git a/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py b/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py index c8d2c278d411..e4045f8508f0 100644 --- a/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py +++ b/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py @@ -88,7 +88,6 @@ def browse_repositories(self, trans, **kwd): if message and status: kwd['message'] = util.sanitize_text(message) kwd['status'] = 'success' if status in ['ok', 'done', 'success'] else 'error' - kwd['dict_format'] = True return self.installed_repository_grid(trans, **kwd) @web.expose diff --git a/lib/galaxy/webapps/galaxy/controllers/dataset.py b/lib/galaxy/webapps/galaxy/controllers/dataset.py index 70ff2813076d..d5abf97fcac7 100644 --- a/lib/galaxy/webapps/galaxy/controllers/dataset.py +++ b/lib/galaxy/webapps/galaxy/controllers/dataset.py @@ -569,7 +569,6 @@ def list(self, trans, **kwargs): kwargs['refresh_frames'] = ['history'] # Render the list view - kwargs['dict_format'] = True return self.stored_list_grid(trans, status=status, message=message, **kwargs) @web.expose diff --git a/lib/galaxy/webapps/galaxy/controllers/forms.py b/lib/galaxy/webapps/galaxy/controllers/forms.py index 0142d8044fdb..8b411d99a7f8 100644 --- a/lib/galaxy/webapps/galaxy/controllers/forms.py +++ b/lib/galaxy/webapps/galaxy/controllers/forms.py @@ -99,7 +99,6 @@ def forms_list(self, trans, payload=None, **kwd): if message and status: kwd['message'] = util.sanitize_text(message) kwd['status'] = status - kwd['dict_format'] = True return self.forms_grid(trans, **kwd) @web.expose_api diff --git a/lib/galaxy/webapps/galaxy/controllers/history.py b/lib/galaxy/webapps/galaxy/controllers/history.py index 097bae0cff73..ebda3c3ecc91 100644 --- a/lib/galaxy/webapps/galaxy/controllers/history.py +++ b/lib/galaxy/webapps/galaxy/controllers/history.py @@ -244,7 +244,6 @@ def list_as_xml(self, trans): @web.expose @web.json def list_published(self, trans, **kwargs): - kwargs['dict_format'] = True return self.published_list_grid(trans, **kwargs) @web.expose_api @@ -314,7 +313,6 @@ def list(self, trans, **kwargs): trans.sa_session.flush() # Render the list view - kwargs['dict_format'] = True if message and status: kwargs['message'] = sanitize_text(message) kwargs['status'] = status @@ -452,7 +450,6 @@ def list_shared(self, trans, **kwargs): message = "Unshared %d shared histories" % len(ids) status = 'done' # Render the list view - kwargs['dict_format'] = True return self.shared_list_grid(trans, status=status, message=message, **kwargs) @web.expose diff --git a/lib/galaxy/webapps/galaxy/controllers/page.py b/lib/galaxy/webapps/galaxy/controllers/page.py index 0c7a37c8af9c..8f9ff09a41d0 100644 --- a/lib/galaxy/webapps/galaxy/controllers/page.py +++ b/lib/galaxy/webapps/galaxy/controllers/page.py @@ -320,7 +320,6 @@ def list(self, trans, *args, **kwargs): session.flush() # Build grid dictionary. - kwargs['dict_format'] = True grid = self._page_list(trans, *args, **kwargs) grid['shared_by_others'] = self._get_shared(trans) return grid @@ -328,7 +327,6 @@ def list(self, trans, *args, **kwargs): @web.expose @web.json def list_published(self, trans, *args, **kwargs): - kwargs['dict_format'] = True grid = self._all_published_list(trans, *args, **kwargs) grid['shared_by_others'] = self._get_shared(trans) return grid @@ -698,7 +696,6 @@ def get_name_and_link_async(self, trans, id=None): @web.require_login("select a history from saved histories") def list_histories_for_selection(self, trans, **kwargs): """ Returns HTML that enables a user to select one or more histories. """ - kwargs['dict_format'] = True return self._history_selection_grid(trans, **kwargs) @web.expose @@ -706,7 +703,6 @@ def list_histories_for_selection(self, trans, **kwargs): @web.require_login("select a workflow from saved workflows") def list_workflows_for_selection(self, trans, **kwargs): """ Returns HTML that enables a user to select one or more workflows. """ - kwargs['dict_format'] = True return self._workflow_selection_grid(trans, **kwargs) @web.expose @@ -714,7 +710,6 @@ def list_workflows_for_selection(self, trans, **kwargs): @web.require_login("select a visualization from saved visualizations") def list_visualizations_for_selection(self, trans, **kwargs): """ Returns HTML that enables a user to select one or more visualizations. """ - kwargs['dict_format'] = True return self._visualization_selection_grid(trans, **kwargs) @web.expose @@ -722,7 +717,6 @@ def list_visualizations_for_selection(self, trans, **kwargs): @web.require_login("select a page from saved pages") def list_pages_for_selection(self, trans, **kwargs): """ Returns HTML that enables a user to select one or more pages. """ - kwargs['dict_format'] = True return self._page_selection_grid(trans, **kwargs) @web.expose @@ -730,7 +724,6 @@ def list_pages_for_selection(self, trans, **kwargs): @web.require_login("select a dataset from saved datasets") def list_datasets_for_selection(self, trans, **kwargs): """ Returns HTML that enables a user to select one or more datasets. """ - kwargs['dict_format'] = True return self._datasets_selection_grid(trans, **kwargs) @web.expose diff --git a/lib/galaxy/webapps/galaxy/controllers/visualization.py b/lib/galaxy/webapps/galaxy/controllers/visualization.py index 8173ab0dca0a..4e0aa904e2d7 100644 --- a/lib/galaxy/webapps/galaxy/controllers/visualization.py +++ b/lib/galaxy/webapps/galaxy/controllers/visualization.py @@ -240,7 +240,6 @@ def __init__(self, app): @web.require_login("see all available libraries") def list_libraries(self, trans, **kwargs): """List all libraries that can be used for selecting datasets.""" - kwargs['dict_format'] = True return self._libraries_grid(trans, **kwargs) @web.expose @@ -249,7 +248,6 @@ def list_libraries(self, trans, **kwargs): def list_history_datasets(self, trans, **kwargs): """List a history's datasets that can be added to a visualization.""" kwargs['show_item_checkboxes'] = 'True' - kwargs['dict_format'] = True return self._history_datasets_grid(trans, **kwargs) @web.expose @@ -258,19 +256,16 @@ def list_history_datasets(self, trans, **kwargs): def list_library_datasets(self, trans, **kwargs): """List a library's datasets that can be added to a visualization.""" kwargs['show_item_checkboxes'] = 'True' - kwargs['dict_format'] = True return self._library_datasets_grid(trans, **kwargs) @web.expose @web.json def list_tracks(self, trans, **kwargs): - kwargs['dict_format'] = True return self._tracks_grid(trans, **kwargs) @web.expose @web.json def list_published(self, trans, *args, **kwargs): - kwargs['dict_format'] = True grid = self._published_list_grid(trans, **kwargs) grid['shared_by_others'] = self._get_shared(trans) return grid @@ -292,7 +287,6 @@ def list(self, trans, **kwargs): self.copy(trans, **kwargs) session.flush() kwargs['embedded'] = True - kwargs['dict_format'] = True if message and status: kwargs['message'] = sanitize_text(message) kwargs['status'] = status diff --git a/lib/galaxy/webapps/galaxy/controllers/workflow.py b/lib/galaxy/webapps/galaxy/controllers/workflow.py index 98f090c167a1..6dc2965c3ad8 100644 --- a/lib/galaxy/webapps/galaxy/controllers/workflow.py +++ b/lib/galaxy/webapps/galaxy/controllers/workflow.py @@ -201,7 +201,6 @@ def list(self, trans): @web.expose @web.json def list_published(self, trans, **kwargs): - kwargs['dict_format'] = True return self.published_list_grid(trans, **kwargs) @web.expose