Skip to content

Commit

Permalink
Remove dict format from controllers
Browse files Browse the repository at this point in the history
  • Loading branch information
@guerler
guerler committed Dec 10, 2017
1 parent 134b3cc commit efbd027
Show file tree
Hide file tree
Showing 8 changed files with 0 additions and 25 deletions.
5 changes: 0 additions & 5 deletions lib/galaxy/webapps/galaxy/controllers/admin.py
View file
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
View file
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion lib/galaxy/webapps/galaxy/controllers/dataset.py
View file
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion lib/galaxy/webapps/galaxy/controllers/forms.py
View file
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions lib/galaxy/webapps/galaxy/controllers/history.py
View file
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
7 changes: 0 additions & 7 deletions lib/galaxy/webapps/galaxy/controllers/page.py
View file
Expand Up @@ -320,15 +320,13 @@ 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

@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
Expand Down Expand Up @@ -698,39 +696,34 @@ 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
@web.json
@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
@web.json
@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
@web.json
@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
@web.json
@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
Expand Down
6 changes: 0 additions & 6 deletions lib/galaxy/webapps/galaxy/controllers/visualization.py
View file
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
1 change: 0 additions & 1 deletion lib/galaxy/webapps/galaxy/controllers/workflow.py
View file
Expand Up @@ -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
Expand Down

0 comments on commit efbd027

Please sign in to comment.